From af4e092e324a8a3e88c42649b7158816c7fbdf43 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Fri, 16 Feb 2018 15:27:19 -0800 Subject: [PATCH 1/6] travis: use Go 1.10 Signed-off-by: Gyuho Lee --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 37f707a6351..8e2bd416cd5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ sudo: required services: docker go: -- 1.9.4 +- "1.10" - tip notifications: @@ -30,7 +30,7 @@ matrix: - go: tip env: TARGET=amd64-go-tip exclude: - - go: 1.9.4 + - go: "1.10" env: TARGET=amd64-go-tip - go: tip env: TARGET=amd64 From 2dd08a08aef4c482968908b6465796a9516607fc Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Fri, 16 Feb 2018 15:27:32 -0800 Subject: [PATCH 2/6] semaphore.sh: use Go 1.10 Signed-off-by: Gyuho Lee --- .semaphore.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.semaphore.sh b/.semaphore.sh index 51d66e88446..f74db332be1 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.4 \ + gcr.io/etcd-development/etcd-test:go1.10 \ /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 From e9b14788cc1d603562bc8cb63a6443211f3f1422 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Fri, 16 Feb 2018 15:27:58 -0800 Subject: [PATCH 3/6] hack/scripts-dev: use Go 1.10 in Makefile 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 8cc5877f843..138c6a0c4be 100644 --- a/hack/scripts-dev/Makefile +++ b/hack/scripts-dev/Makefile @@ -27,7 +27,7 @@ clean: -GO_VERSION ?= 1.9.4 +GO_VERSION ?= 1.10 ETCD_VERSION ?= $(shell git rev-parse --short HEAD || echo "GitNotFound") TEST_SUFFIX = $(shell date +%s | base64 | head -c 15) From ca1885cf1df1dce3dbc8120f5441b68d35ca46b2 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Fri, 16 Feb 2018 15:28:08 -0800 Subject: [PATCH 4/6] tools/functional-tester: use Go 1.10 Signed-off-by: Gyuho Lee --- tools/functional-tester/scripts/docker-local-agent.sh | 2 +- tools/functional-tester/scripts/docker-local-tester.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/functional-tester/scripts/docker-local-agent.sh b/tools/functional-tester/scripts/docker-local-agent.sh index 9bb1a18a654..f72f6620b85 100755 --- a/tools/functional-tester/scripts/docker-local-agent.sh +++ b/tools/functional-tester/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.9.4 + GO_VERSION=1.10 fi echo "Running with GO_VERSION:" ${GO_VERSION} diff --git a/tools/functional-tester/scripts/docker-local-tester.sh b/tools/functional-tester/scripts/docker-local-tester.sh index 9007bdb0ff3..a73f2e54f93 100755 --- a/tools/functional-tester/scripts/docker-local-tester.sh +++ b/tools/functional-tester/scripts/docker-local-tester.sh @@ -3,8 +3,8 @@ < Date: Fri, 16 Feb 2018 15:28:37 -0800 Subject: [PATCH 5/6] README: require Go 1.10+ Signed-off-by: Gyuho Lee --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6efb737124e..ca19a0381b5 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ etcd contributors and maintainers have bi-weekly meetings at 11:00 AM (USA Pacif The easiest way to get etcd is to use one of the pre-built release binaries which are available for OSX, Linux, Windows, [rkt][rkt], and Docker. Instructions for using these binaries are on the [GitHub releases page][github-release]. -For those wanting to try the very latest version, [build the latest version of etcd][dl-build] from the `master` branch. This first needs [*Go*](https://golang.org/) installed (version 1.9+ is required). All development occurs on `master`, including new features and bug fixes. Bug fixes are first targeted at `master` and subsequently ported to release branches, as described in the [branch management][branch-management] guide. +For those wanting to try the very latest version, [build the latest version of etcd][dl-build] from the `master` branch. This first needs [*Go*](https://golang.org/) installed (version 1.10+ is required). All development occurs on `master`, including new features and bug fixes. Bug fixes are first targeted at `master` and subsequently ported to release branches, as described in the [branch management][branch-management] guide. [rkt]: https://github.com/rkt/rkt/releases/ [github-release]: https://github.com/coreos/etcd/releases/ From 089ac72a7c6961d71221335322de5e1d108b8f05 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Tue, 20 Feb 2018 13:21:56 -0800 Subject: [PATCH 6/6] CHANGELOG: add Go 1.10+ for 3.4 Signed-off-by: Gyuho Lee --- CHANGELOG-3.4.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG-3.4.md b/CHANGELOG-3.4.md index 3d0d9a080fd..bda47baed06 100644 --- a/CHANGELOG-3.4.md +++ b/CHANGELOG-3.4.md @@ -47,6 +47,7 @@ See [code changes](https://github.com/coreos/etcd/compare/v3.3.0...v3.4.0) and [ - Move `"github.com/coreos/etcd/etcdserver/auth"` to [`"github.com/coreos/etcd/etcdserver/v2auth"`](https://github.com/coreos/etcd/pull/9275). - Change v3 `etcdctl snapshot` exit codes with [`snapshot` package](https://github.com/coreos/etcd/pull/9118/commits/df689f4280e1cce4b9d61300be13ca604d41670a). - Exit on error with exit code 1 (no more exit code 5 or 6 on `snapshot save/restore` commands). +- Require Go 1.10+. ### Added(`etcd`)