From 032f81ca08cd8561cc89f06341d742a375c2fbcd Mon Sep 17 00:00:00 2001 From: Chun-Hung Tseng Date: Wed, 14 Aug 2024 23:48:01 +0200 Subject: [PATCH] Bump go toolchain to 1.22.7 Reference: - https://github.com/etcd-io/etcd/issues/18443 - https://github.com/etcd-io/etcd/issues/18548#issuecomment-2343061825 Signed-off-by: Chun-Hung Tseng --- .go-version | 2 +- CHANGELOG/CHANGELOG-3.6.md | 4 ++-- api/go.mod | 4 ++-- client/internal/v2/go.mod | 4 ++-- client/pkg/go.mod | 4 ++-- client/v3/go.mod | 4 ++-- etcdctl/go.mod | 4 ++-- etcdutl/go.mod | 4 ++-- go.mod | 4 ++-- pkg/go.mod | 4 ++-- server/go.mod | 4 ++-- tests/go.mod | 4 ++-- tools/mod/go.mod | 4 ++-- tools/rw-heatmaps/go.mod | 4 ++-- tools/testgrid-analysis/go.mod | 4 ++-- 15 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.go-version b/.go-version index 013173af5e9b..a6c2798a482e 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.22.6 +1.23.0 diff --git a/CHANGELOG/CHANGELOG-3.6.md b/CHANGELOG/CHANGELOG-3.6.md index 5d182c0f73a8..6e478eda215e 100644 --- a/CHANGELOG/CHANGELOG-3.6.md +++ b/CHANGELOG/CHANGELOG-3.6.md @@ -98,8 +98,8 @@ See [List of metrics](https://etcd.io/docs/latest/metrics/) for all metrics per - Add [`etcd_server_range_duration_seconds`](https://github.com/etcd-io/etcd/pull/17983). ### Go -- Require [Go 1.22+](https://github.com/etcd-io/etcd/pull/16594). -- Compile with [Go 1.22+](https://go.dev/doc/devel/release#go1.21.minor). Please refer to [gc-guide](https://go.dev/doc/gc-guide) to configure `GOGC` and `GOMEMLIMIT` properly. +- Require [Go 1.23+](https://github.com/etcd-io/etcd/pull/16594). +- Compile with [Go 1.23+](https://go.dev/doc/devel/release#go1.21.minor). Please refer to [gc-guide](https://go.dev/doc/gc-guide) to configure `GOGC` and `GOMEMLIMIT` properly. ### Other diff --git a/api/go.mod b/api/go.mod index a84525d3294b..efcfd2e678fd 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,8 +1,8 @@ module go.etcd.io/etcd/api/v3 -go 1.22 +go 1.23 -toolchain go1.22.6 +toolchain go1.23.0 require ( github.com/coreos/go-semver v0.3.1 diff --git a/client/internal/v2/go.mod b/client/internal/v2/go.mod index 5a0c0029c6ab..c68cefc9d169 100644 --- a/client/internal/v2/go.mod +++ b/client/internal/v2/go.mod @@ -1,8 +1,8 @@ module go.etcd.io/etcd/client/v2 -go 1.22 +go 1.23 -toolchain go1.22.6 +toolchain go1.23.0 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 f8345c3d62a1..cece4abf4b31 100644 --- a/client/pkg/go.mod +++ b/client/pkg/go.mod @@ -1,8 +1,8 @@ module go.etcd.io/etcd/client/pkg/v3 -go 1.22 +go 1.23 -toolchain go1.22.6 +toolchain go1.23.0 require ( github.com/coreos/go-systemd/v22 v22.5.0 diff --git a/client/v3/go.mod b/client/v3/go.mod index 673f189ef0de..e4be6d368293 100644 --- a/client/v3/go.mod +++ b/client/v3/go.mod @@ -1,8 +1,8 @@ module go.etcd.io/etcd/client/v3 -go 1.22 +go 1.23 -toolchain go1.22.6 +toolchain go1.23.0 require ( github.com/coreos/go-semver v0.3.1 diff --git a/etcdctl/go.mod b/etcdctl/go.mod index 18d89980c9a1..1ac723ccdbea 100644 --- a/etcdctl/go.mod +++ b/etcdctl/go.mod @@ -1,8 +1,8 @@ module go.etcd.io/etcd/etcdctl/v3 -go 1.22 +go 1.23 -toolchain go1.22.6 +toolchain go1.23.0 require ( github.com/bgentry/speakeasy v0.2.0 diff --git a/etcdutl/go.mod b/etcdutl/go.mod index 237757b11873..d38b0f70c4e7 100644 --- a/etcdutl/go.mod +++ b/etcdutl/go.mod @@ -1,8 +1,8 @@ module go.etcd.io/etcd/etcdutl/v3 -go 1.22 +go 1.23 -toolchain go1.22.6 +toolchain go1.23.0 replace ( go.etcd.io/etcd/api/v3 => ../api diff --git a/go.mod b/go.mod index 5117ed00b30d..05893ed3a13b 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module go.etcd.io/etcd/v3 -go 1.22 +go 1.23 -toolchain go1.22.6 +toolchain go1.23.0 replace ( go.etcd.io/etcd/api/v3 => ./api diff --git a/pkg/go.mod b/pkg/go.mod index 4e9d252cc01c..082a9308e5b1 100644 --- a/pkg/go.mod +++ b/pkg/go.mod @@ -1,8 +1,8 @@ module go.etcd.io/etcd/pkg/v3 -go 1.22 +go 1.23 -toolchain go1.22.6 +toolchain go1.23.0 require ( github.com/creack/pty v1.1.18 diff --git a/server/go.mod b/server/go.mod index 9f21299371d6..ae9239c757a5 100644 --- a/server/go.mod +++ b/server/go.mod @@ -1,8 +1,8 @@ module go.etcd.io/etcd/server/v3 -go 1.22 +go 1.23 -toolchain go1.22.6 +toolchain go1.23.0 require ( github.com/coreos/go-semver v0.3.1 diff --git a/tests/go.mod b/tests/go.mod index 3612dba1d37c..5e708ecd2615 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -1,8 +1,8 @@ module go.etcd.io/etcd/tests/v3 -go 1.22 +go 1.23 -toolchain go1.22.6 +toolchain go1.23.0 replace ( go.etcd.io/etcd/api/v3 => ../api diff --git a/tools/mod/go.mod b/tools/mod/go.mod index 1d7190c6f913..06ab7f0cdb06 100644 --- a/tools/mod/go.mod +++ b/tools/mod/go.mod @@ -1,8 +1,8 @@ module go.etcd.io/etcd/tools/v3 -go 1.22 +go 1.23 -toolchain go1.22.6 +toolchain go1.23.0 require ( github.com/alexfalkowski/gocovmerge v1.3.13 diff --git a/tools/rw-heatmaps/go.mod b/tools/rw-heatmaps/go.mod index 1c0a6f44f008..f5eed40f768d 100644 --- a/tools/rw-heatmaps/go.mod +++ b/tools/rw-heatmaps/go.mod @@ -1,8 +1,8 @@ module go.etcd.io/etcd/tools/rw-heatmaps/v3 -go 1.22 +go 1.23 -toolchain go1.22.6 +toolchain go1.23.0 require ( github.com/spf13/cobra v1.8.1 diff --git a/tools/testgrid-analysis/go.mod b/tools/testgrid-analysis/go.mod index 6875e575e3dd..42efb0472076 100644 --- a/tools/testgrid-analysis/go.mod +++ b/tools/testgrid-analysis/go.mod @@ -1,8 +1,8 @@ module go.etcd.io/etcd/tools/testgrid-analysis/v3 -go 1.22 +go 1.23 -toolchain go1.22.6 +toolchain go1.23.0 require ( github.com/GoogleCloudPlatform/testgrid v0.0.173