From 4db260134f5eefc9588678d0516c917d4602760c Mon Sep 17 00:00:00 2001 From: James Blair Date: Sun, 13 Aug 2023 16:02:29 +1200 Subject: [PATCH] Backport update to golang 1.20 minor release. Signed-off-by: James Blair --- .go-version | 2 +- Makefile | 2 +- functional/scripts/docker-local-agent.sh | 2 +- functional/scripts/docker-local-tester.sh | 2 +- go.mod | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.go-version b/.go-version index e54f3135a7d..8909929f6e7 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.19.12 +1.20.7 diff --git a/Makefile b/Makefile index 6cd5a4b167a..d34767ace6e 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,7 @@ docker-remove: -GO_VERSION ?= 1.19.9 +GO_VERSION ?= 1.20.7 ETCD_VERSION ?= $(shell git rev-parse --short HEAD || echo "GitNotFound") TEST_SUFFIX = $(shell date +%s | base64 | head -c 15) diff --git a/functional/scripts/docker-local-agent.sh b/functional/scripts/docker-local-agent.sh index 55d06b8df94..337136f9b58 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.19.9 + GO_VERSION=1.20.7 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 b5f5fd74e25..72b1a5a43a9 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.19.9 + GO_VERSION=1.20.7 fi echo "Running with GO_VERSION:" ${GO_VERSION} diff --git a/go.mod b/go.mod index ffb4259260a..862fa0a22ce 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module go.etcd.io/etcd -go 1.19 +go 1.20 require ( github.com/bgentry/speakeasy v0.1.0