diff --git a/.travis.yml b/.travis.yml index 510de69e24e..74bb661d249 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ sudo: required services: docker go: -- 1.11.4 +- 1.12.2 - tip notifications: @@ -30,13 +30,13 @@ env: matrix: fast_finish: true allow_failures: - - go: 1.11.4 + - go: 1.12.2 env: TARGET=linux-amd64-grpcproxy - - go: 1.11.4 + - go: 1.12.2 env: TARGET=linux-amd64-coverage - go: tip env: TARGET=linux-amd64-fmt-unit-go-tip - - go: 1.11.4 + - go: 1.12.2 env: TARGET=linux-386-unit exclude: - go: tip @@ -57,7 +57,7 @@ matrix: env: TARGET=linux-amd64-grpcproxy - go: tip env: TARGET=linux-amd64-coverage - - go: 1.11.4 + - go: 1.12.2 env: TARGET=linux-amd64-fmt-unit-go-tip - go: tip env: TARGET=linux-386-unit diff --git a/Makefile b/Makefile index 21ba4860038..cf2e53fc58b 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,7 @@ docker-remove: -GO_VERSION ?= 1.11.4 +GO_VERSION ?= 1.12.2 ETCD_VERSION ?= $(shell git rev-parse --short HEAD || echo "GitNotFound") TEST_SUFFIX = $(shell date +%s | base64 | head -c 15)