File tree Expand file tree Collapse file tree 11 files changed +25
-18
lines changed Expand file tree Collapse file tree 11 files changed +25
-18
lines changed Original file line number Diff line number Diff line change @@ -10,10 +10,10 @@ jobs:
10
10
steps :
11
11
- uses : actions/checkout@v2
12
12
13
- - name : Set up Go 1.15
13
+ - name : Set up Go 1.16
14
14
uses : actions/setup-go@v1
15
15
with :
16
- go-version : 1.15
16
+ go-version : 1.16
17
17
18
18
- name : Build
19
19
run : script/cibuild
Original file line number Diff line number Diff line change @@ -13,10 +13,10 @@ jobs:
13
13
steps :
14
14
- uses : actions/checkout@v2
15
15
16
- - name : Set up Go 1.14
16
+ - name : Set up Go 1.16
17
17
uses : actions/setup-go@v1
18
18
with :
19
- go-version : 1.14
19
+ go-version : 1.16
20
20
21
21
- name : migration tests
22
22
env :
Original file line number Diff line number Diff line change 1
- #
2
-
3
- FROM golang:1.15.6
1
+ FROM golang:1.16.4
4
2
5
3
RUN apt-get update
6
4
RUN apt-get install -y ruby ruby-dev rubygems build-essential
Original file line number Diff line number Diff line change 1
- FROM golang:1.15.6
1
+ FROM golang:1.16.4
2
2
LABEL maintainer="
[email protected] "
3
3
4
4
RUN apt-get update
Original file line number Diff line number Diff line change @@ -95,7 +95,7 @@ Please see [Coding gh-ost](doc/coding-ghost.md) for a guide to getting started d
95
95
96
96
[ Download latest release here] ( https://github.com/github/gh-ost/releases/latest )
97
97
98
- ` gh-ost ` is a Go project; it is built with Go ` 1.14 ` and above. To build on your own, use either:
98
+ ` gh-ost ` is a Go project; it is built with Go ` 1.15 ` and above. To build on your own, use either:
99
99
- [ script/build] ( https://github.com/github/gh-ost/blob/master/script/build ) - this is the same build script used by CI hence the authoritative; artifact is ` ./bin/gh-ost ` binary.
100
100
- [ build.sh] ( https://github.com/github/gh-ost/blob/master/build.sh ) for building ` tar.gz ` artifacts in ` /tmp/gh-ost `
101
101
Original file line number Diff line number Diff line change @@ -18,15 +18,16 @@ function build {
18
18
GOOS=$3
19
19
GOARCH=$4
20
20
21
- if ! go version | egrep -q ' go(1\.1[456 ])' ; then
22
- echo " go version must be 1.14 or above"
21
+ if ! go version | egrep -q ' go(1\.1[56 ])' ; then
22
+ echo " go version must be 1.15 or above"
23
23
exit 1
24
24
fi
25
25
26
+ # TODO: remove GO111MODULE once gh-ost uses Go modules
26
27
echo " Building ${osname} binary"
27
28
export GOOS
28
29
export GOARCH
29
- go build -ldflags " $ldflags " -o $buildpath /$target go/cmd/gh-ost/main.go
30
+ GO111MODULE=off go build -ldflags " $ldflags " -o $buildpath /$target go/cmd/gh-ost/main.go
30
31
31
32
if [ $? -ne 0 ]; then
32
33
echo " Build failed for ${osname} "
Original file line number Diff line number Diff line change @@ -242,7 +242,10 @@ build_binary() {
242
242
echo " Using binary: $ghost_binary "
243
243
return 0
244
244
fi
245
- go build -o $ghost_binary go/cmd/gh-ost/main.go
245
+
246
+ # TODO: remove GO111MODULE once gh-ost uses Go modules
247
+ GO111MODULE=off go build -o $ghost_binary go/cmd/gh-ost/main.go
248
+
246
249
if [ $? -ne 0 ] ; then
247
250
echo " Build failure"
248
251
exit 1
Original file line number Diff line number Diff line change @@ -17,4 +17,5 @@ export GOPATH="$PWD/.gopath"
17
17
cd .gopath/src/github.com/github/gh-ost
18
18
19
19
# We put the binaries directly into the bindir, because we have no need for shim wrappers
20
- go build -o " $bindir /gh-ost" -ldflags " -X main.AppVersion=${version} -X main.BuildDescribe=${describe} " ./go/cmd/gh-ost/main.go
20
+ # TODO: remove GO111MODULE once gh-ost uses Go modules
21
+ GO111MODULE=off go build -o " $bindir /gh-ost" -ldflags " -X main.AppVersion=${version} -X main.BuildDescribe=${describe} " ./go/cmd/gh-ost/main.go
Original file line number Diff line number Diff line change 1
1
#! /bin/bash
2
2
3
- PREFERRED_GO_VERSION=go1.14.7
4
- SUPPORTED_GO_VERSIONS=' go1.1[456 ]'
3
+ PREFERRED_GO_VERSION=go1.16.4
4
+ SUPPORTED_GO_VERSIONS=' go1.1[56 ]'
5
5
6
6
GO_PKG_DARWIN=${PREFERRED_GO_VERSION} .darwin-amd64.pkg
7
7
GO_PKG_DARWIN_SHA=0f215de06019a054a3da46a0722989986c956d719c7a0a8fc38a5f3c216d6f6b
Original file line number Diff line number Diff line change @@ -13,5 +13,6 @@ script/build
13
13
14
14
cd .gopath/src/github.com/github/gh-ost
15
15
16
+ # TODO: remove GO111MODULE once gh-ost uses Go modules
16
17
echo " Running unit tests"
17
- go test ./go/...
18
+ GO111MODULE=off go test ./go/...
You can’t perform that action at this time.
0 commit comments