Skip to content

Commit

Permalink
Merge pull request etcd-io#18130 from ArkaSaha30/release-3.4-cve-2024…
Browse files Browse the repository at this point in the history
…-24790

[3.4]Bump Go version to 1.21.11: CVE 2024-24790 fix
  • Loading branch information
ahrtr authored Jun 5, 2024
2 parents 88c2295 + 74533d9 commit 041cd4e
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.21.10
1.21.11
2 changes: 1 addition & 1 deletion functional/scripts/docker-local-agent.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ if ! [[ "${0}" =~ "scripts/docker-local-agent.sh" ]]; then
fi

if [[ -z "${GO_VERSION}" ]]; then
GO_VERSION=1.21.10
GO_VERSION=1.21.11
fi
echo "Running with GO_VERSION:" ${GO_VERSION}

Expand Down
2 changes: 1 addition & 1 deletion functional/scripts/docker-local-tester.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ if ! [[ "${0}" =~ "scripts/docker-local-tester.sh" ]]; then
fi

if [[ -z "${GO_VERSION}" ]]; then
GO_VERSION=1.21.10
GO_VERSION=1.21.11
fi
echo "Running with GO_VERSION:" ${GO_VERSION}

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module go.etcd.io/etcd

go 1.21

toolchain go1.21.10
toolchain go1.21.11

require (
github.com/bgentry/speakeasy v0.1.0
Expand Down
2 changes: 1 addition & 1 deletion tools/mod/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module go.etcd.io/etcd/tools/v3

go 1.21

toolchain go1.21.10
toolchain go1.21.11

require (
github.com/gogo/protobuf v1.3.2
Expand Down

0 comments on commit 041cd4e

Please sign in to comment.