From b6d123d08b56dfc16c657dcd59f6d1bca800a6f0 Mon Sep 17 00:00:00 2001 From: James Blair Date: Fri, 11 Aug 2023 15:03:48 +1200 Subject: [PATCH] Update to golang 1.20 minor release. Signed-off-by: James Blair --- .devcontainer/devcontainer.json | 2 +- .github/workflows/e2e-arm64-template.yaml | 2 +- .github/workflows/robustness-template-arm64.yaml | 2 +- .github/workflows/tests-arm64-template.yaml | 2 +- .go-version | 2 +- api/go.mod | 2 +- client/internal/v2/go.mod | 2 +- client/pkg/go.mod | 2 +- client/v3/go.mod | 2 +- etcdctl/go.mod | 2 +- etcdutl/go.mod | 2 +- go.mod | 2 +- pkg/go.mod | 2 +- server/go.mod | 2 +- tests/go.mod | 2 +- tools/mod/go.mod | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index a4ad9a838e6..3496e797575 100644 --- 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 index ae265723418..17b26b8a515 100644 --- 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 index 616cec58254..40c3f66d8ea 100644 --- 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 index 10c3cccc713..24da08df83f 100644 --- 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 index e54f3135a7d..8909929f6e7 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.19.12 +1.20.7 diff --git a/api/go.mod b/api/go.mod index 76868e289ef..7ca818c7be3 100644 --- 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 index 56d86524ee7..e317c9f6580 100644 --- 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 index 87ece1e29db..f738bc5b26d 100644 --- 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 index ea02f8cbd6b..b923976620b 100644 --- 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 index 2a4e623c5a0..ed043d50741 100644 --- 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 index 257f80c8bb7..ec013984f93 100644 --- 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 index 4d113a7ed8f..13457de0feb 100644 --- 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 index 53667d48f98..e9825050296 100644 --- 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 index 9bd5110fe43..4c59fc51291 100644 --- 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 index f9f5381bff2..e8ec069eb74 100644 --- 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 index bac517c805f..f999a1e62d9 100644 --- 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