Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Migrate to go1.22 #17393

Merged
merged 1 commit into from
Mar 7, 2024
+23 −23
Merged

Migrate to go1.22 #17393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,21 @@
// README at: https://github.com/devcontainers/templates/tree/main/src/go
{
"name": "Go",

// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"image": "mcr.microsoft.com/devcontainers/go:1.21-bookworm",

"image": "mcr.microsoft.com/devcontainers/go:1.22-bookworm",
// Features to add to the dev container. More info: https://containers.dev/features.
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
"ghcr.io/devcontainers/features/github-cli:1": {},
"ghcr.io/devcontainers/features/kubectl-helm-minikube:1": {}
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
"ghcr.io/devcontainers/features/github-cli:1": {},
"ghcr.io/devcontainers/features/kubectl-helm-minikube:1": {}
},

// Use 'forwardPorts' to make a list of ports inside the container available locally.
"forwardPorts": [2379, 2380],

"forwardPorts": [
2379,
2380
],
// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": "make build"

// Configure tool-specific properties.
// "customizations": {},
}
}
2 changes: 1 addition & 1 deletion .go-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.21.6
1.22.1
2 changes: 1 addition & 1 deletion api/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.etcd.io/etcd/api/v3

go 1.21
go 1.22

require (
github.com/coreos/go-semver v0.3.1
Expand Down
2 changes: 1 addition & 1 deletion client/internal/v2/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.etcd.io/etcd/client/v2

go 1.21
go 1.22

require (
go.etcd.io/etcd/api/v3 v3.6.0-alpha.0
Expand Down
2 changes: 1 addition & 1 deletion client/pkg/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.etcd.io/etcd/client/pkg/v3

go 1.21
go 1.22

require (
github.com/coreos/go-systemd/v22 v22.5.0
Expand Down
2 changes: 1 addition & 1 deletion client/v3/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.etcd.io/etcd/client/v3

go 1.21
go 1.22

require (
github.com/coreos/go-semver v0.3.1
Expand Down
2 changes: 1 addition & 1 deletion etcdctl/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.etcd.io/etcd/etcdctl/v3

go 1.21
go 1.22

require (
github.com/bgentry/speakeasy v0.1.0
Expand Down
2 changes: 1 addition & 1 deletion etcdutl/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.etcd.io/etcd/etcdutl/v3

go 1.21
go 1.22

replace (
go.etcd.io/etcd/api/v3 => ../api
Expand Down
4 changes: 3 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
module go.etcd.io/etcd/v3

go 1.21
go 1.22

toolchain go1.22.1

replace (
go.etcd.io/etcd/api/v3 => ./api
Expand Down
2 changes: 1 addition & 1 deletion pkg/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.etcd.io/etcd/pkg/v3

go 1.21
go 1.22

require (
github.com/creack/pty v1.1.18
Expand Down
2 changes: 1 addition & 1 deletion server/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.etcd.io/etcd/server/v3

go 1.21
go 1.22

require (
github.com/coreos/go-semver v0.3.1
Expand Down
2 changes: 1 addition & 1 deletion tests/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.etcd.io/etcd/tests/v3

go 1.21
go 1.22

replace (
go.etcd.io/etcd/api/v3 => ../api
Expand Down
2 changes: 1 addition & 1 deletion tools/mod/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.etcd.io/etcd/tools/v3

go 1.21
go 1.22

require (
github.com/alexfalkowski/gocovmerge v1.2.6
Expand Down
Loading