From 7df3dfbcdde6cd0fe16c88cc3901e88506e946fb Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Tue, 23 Jan 2018 13:17:20 -0800 Subject: [PATCH 1/2] semaphore,travis: test with Go 1.9.3 Signed-off-by: Gyuho Lee --- .semaphore.sh | 2 +- .travis.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.semaphore.sh b/.semaphore.sh index 3e3295227..b52e79af8 100755 --- a/.semaphore.sh +++ b/.semaphore.sh @@ -10,7 +10,7 @@ fi docker run \ --rm \ --volume=`pwd`:/go/src/github.com/coreos/etcd \ - gcr.io/etcd-development/etcd-test:go1.9.2 \ + gcr.io/etcd-development/etcd-test:go1.9.3 \ /bin/bash -c "${TEST_OPTS} ./test 2>&1 | tee test-${TEST_SUFFIX}.log" ! egrep "(--- FAIL:|panic: test timed out|appears to have leaked)" -B50 -A10 test-${TEST_SUFFIX}.log diff --git a/.travis.yml b/.travis.yml index ace4f5ce2..0c484d37c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ sudo: required services: docker go: -- 1.9.2 +- 1.9.3 - tip notifications: @@ -30,7 +30,7 @@ matrix: - go: tip env: TARGET=amd64-go-tip exclude: - - go: 1.9.2 + - go: 1.9.3 env: TARGET=amd64-go-tip - go: tip env: TARGET=amd64 @@ -48,7 +48,7 @@ matrix: env: TARGET=ppc64le before_install: -- docker pull gcr.io/etcd-development/etcd-test:go1.9.2 +- docker pull gcr.io/etcd-development/etcd-test:go1.9.3 install: - pushd cmd/etcd && go get -t -v ./... && popd @@ -58,7 +58,7 @@ script: case "${TARGET}" in amd64) docker run --rm \ - --volume=`pwd`:/go/src/github.com/coreos/etcd gcr.io/etcd-development/etcd-test:go1.9.2 \ + --volume=`pwd`:/go/src/github.com/coreos/etcd gcr.io/etcd-development/etcd-test:go1.9.3 \ /bin/bash -c "GOARCH=amd64 ./test" ;; amd64-go-tip) @@ -66,23 +66,23 @@ script: ;; darwin-amd64) docker run --rm \ - --volume=`pwd`:/go/src/github.com/coreos/etcd gcr.io/etcd-development/etcd-test:go1.9.2 \ + --volume=`pwd`:/go/src/github.com/coreos/etcd gcr.io/etcd-development/etcd-test:go1.9.3 \ /bin/bash -c "GO_BUILD_FLAGS='-a -v' GOOS=darwin GOARCH=amd64 ./build" ;; windows-amd64) docker run --rm \ - --volume=`pwd`:/go/src/github.com/coreos/etcd gcr.io/etcd-development/etcd-test:go1.9.2 \ + --volume=`pwd`:/go/src/github.com/coreos/etcd gcr.io/etcd-development/etcd-test:go1.9.3 \ /bin/bash -c "GO_BUILD_FLAGS='-a -v' GOOS=windows GOARCH=amd64 ./build" ;; 386) docker run --rm \ - --volume=`pwd`:/go/src/github.com/coreos/etcd gcr.io/etcd-development/etcd-test:go1.9.2 \ + --volume=`pwd`:/go/src/github.com/coreos/etcd gcr.io/etcd-development/etcd-test:go1.9.3 \ /bin/bash -c "GOARCH=386 PASSES='build unit' ./test" ;; *) # test building out of gopath docker run --rm \ - --volume=`pwd`:/go/src/github.com/coreos/etcd gcr.io/etcd-development/etcd-test:go1.9.2 \ + --volume=`pwd`:/go/src/github.com/coreos/etcd gcr.io/etcd-development/etcd-test:go1.9.3 \ /bin/bash -c "GO_BUILD_FLAGS='-a -v' GOARCH='${TARGET}' ./build" ;; esac From efb7958687755687c2cad97c9508c112a64f6c7c Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Tue, 23 Jan 2018 13:17:32 -0800 Subject: [PATCH 2/2] hack/scripts-dev: use Go 1.9.3 by default Signed-off-by: Gyuho Lee --- hack/scripts-dev/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/scripts-dev/Makefile b/hack/scripts-dev/Makefile index eb464cd3f..cfa0a57c8 100644 --- a/hack/scripts-dev/Makefile +++ b/hack/scripts-dev/Makefile @@ -27,7 +27,7 @@ clean: -_GO_VERSION = 1.9.2 +_GO_VERSION = 1.9.3 ifdef GO_VERSION _GO_VERSION = $(GO_VERSION) endif