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

Migrate to golang 1.20
ahrtr · Aug 11, 2023 · 1edd8ba · 1edd8ba
2 parents baf7a34 + b6d123d
commit 1edd8ba
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 16 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -4,7 +4,7 @@
 	"name": "Go",
 
 	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-	"image": "mcr.microsoft.com/devcontainers/go:1.19-bullseye",
+	"image": "mcr.microsoft.com/devcontainers/go:1.20-bullseye",
 
 	// Features to add to the dev container. More info: https://containers.dev/features.
 	"features": {

diff --git a/.github/workflows/e2e-arm64-template.yaml b/.github/workflows/e2e-arm64-template.yaml
@@ -12,7 +12,7 @@ jobs:
     # this is to prevent the job to run at forked projects
     if: github.repository == 'etcd-io/etcd'
     runs-on: [self-hosted, Linux, ARM64]
-    container: golang:1.19-bullseye
+    container: golang:1.20-bullseye
     defaults:
       run:
         shell: bash

diff --git a/.github/workflows/robustness-template-arm64.yaml b/.github/workflows/robustness-template-arm64.yaml
@@ -27,7 +27,7 @@ jobs:
     timeout-minutes: 210
     runs-on: ${{ fromJson(inputs.runs-on) }}
     container:
-      image: golang:1.19-bullseye
+      image: golang:1.20-bullseye
       # Required for mounting fuse lazyfs
       options: --privileged
     defaults:

diff --git a/.github/workflows/tests-arm64-template.yaml b/.github/workflows/tests-arm64-template.yaml
@@ -17,7 +17,7 @@ jobs:
     # this is to prevent the job to run at forked projects
     if: github.repository == 'etcd-io/etcd'
     runs-on: [self-hosted, Linux, ARM64]
-    container: golang:1.19-bullseye
+    container: golang:1.20-bullseye
     defaults:
       run:
         shell: bash

diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.19.12
+1.20.7
diff --git a/api/go.mod b/api/go.mod
@@ -1,6 +1,6 @@
 module go.etcd.io/etcd/api/v3
 
-go 1.19
+go 1.20
 
 require (
 	github.com/coreos/go-semver v0.3.1

diff --git a/client/internal/v2/go.mod b/client/internal/v2/go.mod
@@ -1,6 +1,6 @@
 module go.etcd.io/etcd/client/v2
 
-go 1.19
+go 1.20
 
 require (
 	go.etcd.io/etcd/api/v3 v3.6.0-alpha.0

diff --git a/client/pkg/go.mod b/client/pkg/go.mod
@@ -1,6 +1,6 @@
 module go.etcd.io/etcd/client/pkg/v3
 
-go 1.19
+go 1.20
 
 require (
 	github.com/coreos/go-systemd/v22 v22.5.0

diff --git a/client/v3/go.mod b/client/v3/go.mod
@@ -1,6 +1,6 @@
 module go.etcd.io/etcd/client/v3
 
-go 1.19
+go 1.20
 
 require (
 	github.com/coreos/go-semver v0.3.1

diff --git a/etcdctl/go.mod b/etcdctl/go.mod
@@ -1,6 +1,6 @@
 module go.etcd.io/etcd/etcdctl/v3
 
-go 1.19
+go 1.20
 
 require (
 	github.com/bgentry/speakeasy v0.1.0

diff --git a/etcdutl/go.mod b/etcdutl/go.mod
@@ -1,6 +1,6 @@
 module go.etcd.io/etcd/etcdutl/v3
 
-go 1.19
+go 1.20
 
 replace (
 	go.etcd.io/etcd/api/v3 => ../api

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module go.etcd.io/etcd/v3
 
-go 1.19
+go 1.20
 
 replace (
 	go.etcd.io/etcd/api/v3 => ./api

diff --git a/pkg/go.mod b/pkg/go.mod
@@ -1,6 +1,6 @@
 module go.etcd.io/etcd/pkg/v3
 
-go 1.19
+go 1.20
 
 require (
 	github.com/creack/pty v1.1.18

diff --git a/server/go.mod b/server/go.mod
@@ -1,6 +1,6 @@
 module go.etcd.io/etcd/server/v3
 
-go 1.19
+go 1.20
 
 require (
 	github.com/coreos/go-semver v0.3.1

diff --git a/tests/go.mod b/tests/go.mod
@@ -1,6 +1,6 @@
 module go.etcd.io/etcd/tests/v3
 
-go 1.19
+go 1.20
 
 replace (
 	go.etcd.io/etcd/api/v3 => ../api

diff --git a/tools/mod/go.mod b/tools/mod/go.mod
@@ -1,6 +1,6 @@
 module go.etcd.io/etcd/tools/v3
 
-go 1.19
+go 1.20
 
 require (
 	github.com/alexfalkowski/gocovmerge v1.1.8