Skip to content

Commit 72d48d4

Browse files
author
Shlomi Noach
authored
Merge pull request #57 from github/go19
Build using and requires go1.9
2 parents 7b93605 + aaedf56 commit 72d48d4

File tree

3 files changed

+15
-12
lines changed

3 files changed

+15
-12
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# http://docs.travis-ci.com/user/languages/go/
22
language: go
33

4-
go: 1.8
4+
go: 1.9
55

66
os:
77
- linux

build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ function precheck() {
7272
ok=1
7373
fi
7474

75-
if [[ $(go version | egrep "go1[.][0123456]") ]]; then
76-
echo "go version is too low. Must use 1.7 or above"
75+
if [[ $(go version | egrep "go1[.][012345678]") ]]; then
76+
echo "go version is too low. Must use 1.9 or above"
7777
ok=1
7878
fi
7979

script/ensure-go-installed

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
#!/bin/bash
22

3-
GO_VERSION=go1.7
3+
PREFERRED_GO_VERSION=go1.9.2
4+
SUPPORTED_GO_VERSIONS='go1.[89]'
45

5-
GO_PKG_DARWIN=${GO_VERSION}.darwin-amd64.pkg
6-
GO_PKG_DARWIN_SHA=e7089843bc7148ffcc147759985b213604d22bb9fd19bd930b515aa981bf1b22
6+
GO_PKG_DARWIN=${PREFERRED_GO_VERSION}.darwin-amd64.pkg
7+
GO_PKG_DARWIN_SHA=73fd5840d55f5566d8db6c0ffdd187577e8ebe650c783f68bd27cbf95bde6743
78

8-
GO_PKG_LINUX=${GO_VERSION}.linux-amd64.tar.gz
9-
GO_PKG_LINUX_SHA=702ad90f705365227e902b42d91dd1a40e48ca7f67a2f4b2fd052aaa4295cd95
9+
GO_PKG_LINUX=${PREFERRED_GO_VERSION}.linux-amd64.tar.gz
10+
GO_PKG_LINUX_SHA=de874549d9a8d8d8062be05808509c09a88a248e77ec14eb77453530829ac02b
1011

1112
export ROOTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
1213
cd $ROOTDIR
1314

1415
# If Go isn't installed globally, setup environment variables for local install.
15-
if [ -z "$(which go)" ] || [ -z "$(go version | grep $GO_VERSION)" ]; then
16-
GODIR="$ROOTDIR/.vendor/go17"
16+
if [ -z "$(which go)" ] || [ -z "$(go version | grep "$SUPPORTED_GO_VERSIONS")" ]; then
17+
GODIR="$ROOTDIR/.vendor/go19"
1718

1819
if [ $(uname -s) = "Darwin" ]; then
1920
export GOROOT="$GODIR/usr/local/go"
@@ -25,7 +26,7 @@ if [ -z "$(which go)" ] || [ -z "$(go version | grep $GO_VERSION)" ]; then
2526
fi
2627

2728
# Check if local install exists, and install otherwise.
28-
if [ -z "$(which go)" ] || [ -z "$(go version | grep $GO_VERSION)" ]; then
29+
if [ -z "$(which go)" ] || [ -z "$(go version | grep "$SUPPORTED_GO_VERSIONS")" ]; then
2930
[ -d "$GODIR" ] && rm -rf $GODIR
3031
mkdir -p "$GODIR"
3132
cd "$GODIR";
@@ -42,7 +43,9 @@ if [ -z "$(which go)" ] || [ -z "$(go version | grep $GO_VERSION)" ]; then
4243
fi
4344

4445
# Prove we did something right
45-
echo "$GO_VERSION installed in $GODIR: Go Binary: $(which go)"
46+
echo "$(go version) installed in $GODIR: Go Binary: $(which go)"
47+
else
48+
echo "$(go version) found in $GODIR: Go Binary: $(which go)"
4649
fi
4750

4851
cd $ROOTDIR

0 commit comments

Comments
 (0)