diff --git a/.travis.yml b/.travis.yml index f5cbb25a3..f82f03518 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ sudo: required services: docker go: -- 1.12.9 +- 1.12.12 notifications: on_success: never @@ -27,9 +27,9 @@ env: matrix: fast_finish: true allow_failures: - - go: 1.12.9 + - go: 1.12.12 env: TARGET=linux-amd64-grpcproxy - - go: 1.12.9 + - go: 1.12.12 env: TARGET=linux-386-unit before_install: diff --git a/Makefile b/Makefile index 8b0b1b5ed..d05abcfa5 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,7 @@ docker-remove: -GO_VERSION ?= 1.12.9 +GO_VERSION ?= 1.12.12 ETCD_VERSION ?= $(shell git rev-parse --short HEAD || echo "GitNotFound") TEST_SUFFIX = $(shell date +%s | base64 | head -c 15) @@ -65,11 +65,11 @@ endif # Example: -# GO_VERSION=1.12.9 make build-docker-test +# GO_VERSION=1.12.12 make build-docker-test # make build-docker-test # # gcloud docker -- login -u _json_key -p "$(cat /etc/gcp-key-etcd-development.json)" https://gcr.io -# GO_VERSION=1.12.9 make push-docker-test +# GO_VERSION=1.12.12 make push-docker-test # make push-docker-test # # gsutil -m acl ch -u allUsers:R -r gs://artifacts.etcd-development.appspot.com diff --git a/functional/scripts/docker-local-agent.sh b/functional/scripts/docker-local-agent.sh index c650d5dcd..a7f56fc63 100755 --- a/functional/scripts/docker-local-agent.sh +++ b/functional/scripts/docker-local-agent.sh @@ -13,7 +13,7 @@ if ! [[ "${0}" =~ "scripts/docker-local-agent.sh" ]]; then fi if [[ -z "${GO_VERSION}" ]]; then - GO_VERSION=1.12.9 + GO_VERSION=1.12.12 fi echo "Running with GO_VERSION:" ${GO_VERSION} diff --git a/functional/scripts/docker-local-tester.sh b/functional/scripts/docker-local-tester.sh index 00970659d..b7d90f395 100755 --- a/functional/scripts/docker-local-tester.sh +++ b/functional/scripts/docker-local-tester.sh @@ -6,7 +6,7 @@ if ! [[ "${0}" =~ "scripts/docker-local-tester.sh" ]]; then fi if [[ -z "${GO_VERSION}" ]]; then - GO_VERSION=1.12.9 + GO_VERSION=1.12.12 fi echo "Running with GO_VERSION:" ${GO_VERSION}