Skip to content

Commit fd37511

Browse files
committed
fix build scripts, port go-mysql-org/go-mysql#349 to remove cgo dep
1 parent 8e5bd71 commit fd37511

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

build.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,7 @@ main() {
7373
(cd $buildpath && shasum -a256 gh-ost* 2>/dev/null)
7474
}
7575

76+
. script/bootstrap
77+
cd .gopath/src/github.com/github/gh-ost
78+
7679
main "$@"

script/bootstrap

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ set -e
1010
# Since we want to be able to build this outside of GOPATH, we set it
1111
# up so it points back to us and go is none the wiser
1212

13-
set -x
1413
rm -rf .gopath
1514
mkdir -p .gopath/src/github.com/github
1615
ln -s "$PWD" .gopath/src/github.com/github/gh-ost

script/ensure-go-installed

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
PREFERRED_GO_VERSION=go1.16.4
4-
SUPPORTED_GO_VERSIONS='go1.1[56]'
4+
SUPPORTED_GO_VERSIONS='go1.1[567]'
55

66
GO_PKG_DARWIN=${PREFERRED_GO_VERSION}.darwin-amd64.pkg
77
GO_PKG_DARWIN_SHA=0f215de06019a054a3da46a0722989986c956d719c7a0a8fc38a5f3c216d6f6b
@@ -35,7 +35,7 @@ if [ -z "$(which go)" ] || [ -z "$(go version | grep "$SUPPORTED_GO_VERSIONS")"
3535
curl -L -O https://dl.google.com/go/$GO_PKG_DARWIN
3636
shasum -a256 $GO_PKG_DARWIN | grep $GO_PKG_DARWIN_SHA
3737
xar -xf $GO_PKG_DARWIN
38-
cpio -i < com.googlecode.go.pkg/Payload
38+
cpio -i < org.golang.go.pkg/Payload
3939
else
4040
curl -L -O https://dl.google.com/go/$GO_PKG_LINUX
4141
shasum -a256 $GO_PKG_LINUX | grep $GO_PKG_LINUX_SHA

vendor/github.com/siddontang/go-mysql/client/resp.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/siddontang/go-mysql/packet/conn.go

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)