Skip to content

Commit

Permalink
Merge pull request #18445 from henrybear327/3.4_go/1.22.0
Browse files Browse the repository at this point in the history
[release-3.4] Bump go toolchain to 1.22.6
  • Loading branch information
ahrtr authored Aug 16, 2024
2 parents e0ef969 + 2419425 commit c12e955
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.21.13
1.22.6
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.13
GO_VERSION=1.22.6
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.13
GO_VERSION=1.22.6
fi
echo "Running with GO_VERSION:" ${GO_VERSION}

Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module go.etcd.io/etcd

go 1.21
go 1.22

toolchain go1.21.13
toolchain go1.22.6

require (
github.com/bgentry/speakeasy v0.1.0
Expand Down
2 changes: 1 addition & 1 deletion pkg/debugutil/pprof.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func PProfHandlers() map[string]http.Handler {
m[HTTPPrefixPProf+"/profile"] = http.HandlerFunc(pprof.Profile)
m[HTTPPrefixPProf+"/symbol"] = http.HandlerFunc(pprof.Symbol)
m[HTTPPrefixPProf+"/cmdline"] = http.HandlerFunc(pprof.Cmdline)
m[HTTPPrefixPProf+"/trace "] = http.HandlerFunc(pprof.Trace)
m[HTTPPrefixPProf+"/trace"] = http.HandlerFunc(pprof.Trace)
m[HTTPPrefixPProf+"/heap"] = pprof.Handler("heap")
m[HTTPPrefixPProf+"/goroutine"] = pprof.Handler("goroutine")
m[HTTPPrefixPProf+"/threadcreate"] = pprof.Handler("threadcreate")
Expand Down
4 changes: 2 additions & 2 deletions tools/mod/go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module go.etcd.io/etcd/tools/v3

go 1.21
go 1.22

toolchain go1.21.13
toolchain go1.22.6

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

0 comments on commit c12e955

Please sign in to comment.