diff --git a/.travis.yml b/.travis.yml index fbb3a862742..ed0b0ec3f7d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,8 @@ sudo: required services: docker go: -- 1.12.9 -- tip + - 1.13 + - tip notifications: on_success: never @@ -15,62 +15,62 @@ notifications: env: matrix: - - TARGET=linux-amd64-fmt - - TARGET=linux-amd64-integration-1-cpu - - TARGET=linux-amd64-integration-2-cpu - - TARGET=linux-amd64-integration-4-cpu - - TARGET=linux-amd64-functional - - TARGET=linux-amd64-unit - - TARGET=all-build - - TARGET=linux-amd64-grpcproxy - - TARGET=linux-amd64-coverage - - TARGET=linux-amd64-fmt-unit-go-tip - - TARGET=linux-386-unit + - TARGET=linux-amd64-fmt + - TARGET=linux-amd64-integration-1-cpu + - TARGET=linux-amd64-integration-2-cpu + - TARGET=linux-amd64-integration-4-cpu + - TARGET=linux-amd64-functional + - TARGET=linux-amd64-unit + - TARGET=all-build + - TARGET=linux-amd64-grpcproxy + - TARGET=linux-amd64-coverage + - TARGET=linux-amd64-fmt-unit-go-tip + - TARGET=linux-386-unit matrix: fast_finish: true allow_failures: - - go: 1.12.9 - env: TARGET=linux-amd64-grpcproxy - - go: 1.12.9 - env: TARGET=linux-amd64-coverage - - go: tip - env: TARGET=linux-amd64-fmt-unit-go-tip - - go: 1.12.9 - env: TARGET=linux-386-unit + - go: 1.13 + env: TARGET=linux-amd64-grpcproxy + - go: 1.13 + env: TARGET=linux-amd64-coverage + - go: tip + env: TARGET=linux-amd64-fmt-unit-go-tip + - go: 1.13 + env: TARGET=linux-386-unit exclude: - - go: tip - env: TARGET=linux-amd64-fmt - - go: tip - env: TARGET=linux-amd64-integration-1-cpu - - go: tip - env: TARGET=linux-amd64-integration-2-cpu - - go: tip - env: TARGET=linux-amd64-integration-4-cpu - - go: tip - env: TARGET=linux-amd64-functional - - go: tip - env: TARGET=linux-amd64-unit - - go: tip - env: TARGET=all-build - - go: tip - env: TARGET=linux-amd64-grpcproxy - - go: tip - env: TARGET=linux-amd64-coverage - - go: 1.12.9 - env: TARGET=linux-amd64-fmt-unit-go-tip - - go: tip - env: TARGET=linux-386-unit + - go: tip + env: TARGET=linux-amd64-fmt + - go: tip + env: TARGET=linux-amd64-integration-1-cpu + - go: tip + env: TARGET=linux-amd64-integration-2-cpu + - go: tip + env: TARGET=linux-amd64-integration-4-cpu + - go: tip + env: TARGET=linux-amd64-functional + - go: tip + env: TARGET=linux-amd64-unit + - go: tip + env: TARGET=all-build + - go: tip + env: TARGET=linux-amd64-grpcproxy + - go: tip + env: TARGET=linux-amd64-coverage + - go: 1.13 + env: TARGET=linux-amd64-fmt-unit-go-tip + - go: tip + env: TARGET=linux-386-unit before_install: -- if [[ $TRAVIS_GO_VERSION == 1.* ]]; then docker pull gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION}; fi + - if [[ $TRAVIS_GO_VERSION == 1.* ]]; then docker pull gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION}; fi install: -- go get -t -v -d ./... + - go get -t -v -d ./... script: - - echo "TRAVIS_GO_VERSION=${TRAVIS_GO_VERSION}" - - > + - echo "TRAVIS_GO_VERSION=${TRAVIS_GO_VERSION}" + - > case "${TARGET}" in linux-amd64-fmt) docker run --rm \ diff --git a/Makefile b/Makefile index 8b0b1b5ed0c..964d698ddbe 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,7 @@ docker-remove: -GO_VERSION ?= 1.12.9 +GO_VERSION ?= 1.13 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.13 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.13 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 c650d5dcdb9..6e2b92ac08f 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.13 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 00970659dc5..430a0e2308f 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.13 fi echo "Running with GO_VERSION:" ${GO_VERSION} diff --git a/tests/semaphore.test.bash b/tests/semaphore.test.bash index b04a1c5a6f3..2b34bd437d0 100755 --- a/tests/semaphore.test.bash +++ b/tests/semaphore.test.bash @@ -8,10 +8,10 @@ fi <