Merge pull request etcd-io#16406 from jmhbnz/backport-update-to-go-1.20

[3.4] Backport update to golang 1.20 minor release
fuweid · Aug 17, 2023 · 420669a · 420669a
2 parents 7655708 + 4db2601
commit 420669a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.19.12
+1.20.7
diff --git 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
@@ -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
@@ -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
@@ -1,6 +1,6 @@
 module go.etcd.io/etcd
 
-go 1.19
+go 1.20
 
 require (
 	github.com/bgentry/speakeasy v0.1.0