Skip to content

Commit 4bfbe90

Browse files
Merge pull request #876 from github/golang1.14
Update to golang:1.14.7, add @timvaillancourt to README.md
2 parents f334dbd + 0ac3a38 commit 4bfbe90

File tree

7 files changed

+16
-17
lines changed

7 files changed

+16
-17
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,12 @@ jobs:
88
runs-on: ubuntu-latest
99

1010
steps:
11-
- uses: actions/checkout@master
11+
- uses: actions/checkout@v2
1212

13-
- name: Set up Go 1.12
13+
- name: Set up Go 1.14
1414
uses: actions/setup-go@v1
1515
with:
16-
version: 1.12
17-
id: go
16+
go-version: 1.14
1817

1918
- name: Build
2019
run: script/cibuild

.github/workflows/replica-tests.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,12 @@ jobs:
88
runs-on: ubuntu-latest
99

1010
steps:
11-
- uses: actions/checkout@master
11+
- uses: actions/checkout@v2
1212

13-
- name: Set up Go 1.12
13+
- name: Set up Go 1.14
1414
uses: actions/setup-go@v1
1515
with:
16-
version: 1.12
17-
id: go
16+
go-version: 1.14
1817

1918
- name: migration tests
2019
run: script/cibuild-gh-ost-replica-tests

Dockerfile.packaging

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22

3-
FROM golang:1.12.6
3+
FROM golang:1.14.7
44

55
RUN apt-get update
66
RUN apt-get install -y ruby ruby-dev rubygems build-essential

Dockerfile.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.12.1
1+
FROM golang:1.14.7
22
LABEL maintainer="[email protected]"
33

44
RUN apt-get update

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ Please see [Coding gh-ost](doc/coding-ghost.md) for a guide to getting started d
9494

9595
[Download latest release here](https://github.com/github/gh-ost/releases/latest)
9696

97-
`gh-ost` is a Go project; it is built with Go `1.12` and above. To build on your own, use either:
97+
`gh-ost` is a Go project; it is built with Go `1.14` and above. To build on your own, use either:
9898
- [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.
9999
- [build.sh](https://github.com/github/gh-ost/blob/master/build.sh) for building `tar.gz` artifacts in `/tmp/gh-ost`
100100

@@ -109,3 +109,4 @@ Generally speaking, `master` branch is stable, but only [releases](https://githu
109109
- [@shlomi-noach](https://github.com/shlomi-noach)
110110
- [@jessbreckenridge](https://github.com/jessbreckenridge)
111111
- [@gtowey](https://github.com/gtowey)
112+
- [@timvaillancourt](https://github.com/timvaillancourt)

build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ function build {
1818
GOOS=$3
1919
GOARCH=$4
2020

21-
if ! go version | egrep -q 'go(1\.1[234])' ; then
22-
echo "go version must be 1.12 or above"
21+
if ! go version | egrep -q 'go(1\.1[456])' ; then
22+
echo "go version must be 1.14 or above"
2323
exit 1
2424
fi
2525

script/ensure-go-installed

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

3-
PREFERRED_GO_VERSION=go1.12.6
4-
SUPPORTED_GO_VERSIONS='go1.1[234]'
3+
PREFERRED_GO_VERSION=go1.14.7
4+
SUPPORTED_GO_VERSIONS='go1.1[456]'
55

66
GO_PKG_DARWIN=${PREFERRED_GO_VERSION}.darwin-amd64.pkg
7-
GO_PKG_DARWIN_SHA=ea78245e43de2996fa0973033064b33f48820cfe39f4f3c6e953040925cc5815
7+
GO_PKG_DARWIN_SHA=0f215de06019a054a3da46a0722989986c956d719c7a0a8fc38a5f3c216d6f6b
88

99
GO_PKG_LINUX=${PREFERRED_GO_VERSION}.linux-amd64.tar.gz
10-
GO_PKG_LINUX_SHA=dbcf71a3c1ea53b8d54ef1b48c85a39a6c9a935d01fc8291ff2b92028e59913c
10+
GO_PKG_LINUX_SHA=4a7fa60f323ee1416a4b1425aefc37ea359e9d64df19c326a58953a97ad41ea5
1111

1212
export ROOTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
1313
cd $ROOTDIR

0 commit comments

Comments
 (0)