Skip to content

Commit b54d256

Browse files
authored
Merge branch 'master' into workflow-upload-artifact
2 parents b9d400a + 34d1624 commit b54d256

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

README.md

Lines changed: 1 addition & 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

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ function build {
1818
GOOS=$3
1919
GOARCH=$4
2020

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

script/ensure-go-installed

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

33
PREFERRED_GO_VERSION=go1.14.4
4-
SUPPORTED_GO_VERSIONS='go1.1[23456]'
4+
SUPPORTED_GO_VERSIONS='go1.1[456]'
55

66
GO_PKG_DARWIN=${PREFERRED_GO_VERSION}.darwin-amd64.pkg
77
GO_PKG_DARWIN_SHA=b518f21f823759ee30faddb1f623810a432499f050c9338777523d9c8551c62c

0 commit comments

Comments
 (0)