Skip to content

Commit

Permalink
fix build scripts, port go-mysql-org/go-mysql#349 to remove cgo dep
Browse files Browse the repository at this point in the history
  • Loading branch information
dm-2 committed Jan 26, 2022
1 parent 8e5bd71 commit fd37511
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
3 changes: 3 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,7 @@ main() {
(cd $buildpath && shasum -a256 gh-ost* 2>/dev/null)
}

. script/bootstrap
cd .gopath/src/github.com/github/gh-ost

main "$@"
1 change: 0 additions & 1 deletion script/bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ set -e
# Since we want to be able to build this outside of GOPATH, we set it
# up so it points back to us and go is none the wiser

set -x
rm -rf .gopath
mkdir -p .gopath/src/github.com/github
ln -s "$PWD" .gopath/src/github.com/github/gh-ost
Expand Down
4 changes: 2 additions & 2 deletions script/ensure-go-installed
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

PREFERRED_GO_VERSION=go1.16.4
SUPPORTED_GO_VERSIONS='go1.1[56]'
SUPPORTED_GO_VERSIONS='go1.1[567]'

GO_PKG_DARWIN=${PREFERRED_GO_VERSION}.darwin-amd64.pkg
GO_PKG_DARWIN_SHA=0f215de06019a054a3da46a0722989986c956d719c7a0a8fc38a5f3c216d6f6b
Expand Down Expand Up @@ -35,7 +35,7 @@ if [ -z "$(which go)" ] || [ -z "$(go version | grep "$SUPPORTED_GO_VERSIONS")"
curl -L -O https://dl.google.com/go/$GO_PKG_DARWIN
shasum -a256 $GO_PKG_DARWIN | grep $GO_PKG_DARWIN_SHA
xar -xf $GO_PKG_DARWIN
cpio -i < com.googlecode.go.pkg/Payload
cpio -i < org.golang.go.pkg/Payload
else
curl -L -O https://dl.google.com/go/$GO_PKG_LINUX
shasum -a256 $GO_PKG_LINUX | grep $GO_PKG_LINUX_SHA
Expand Down
1 change: 0 additions & 1 deletion vendor/github.com/siddontang/go-mysql/client/resp.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions vendor/github.com/siddontang/go-mysql/packet/conn.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit fd37511

Please sign in to comment.