Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18445 from henrybear327/3.4_go/1.22.0

Browse Source 
[release-3.4] Bump go toolchain to 1.22.6
This commit is contained in:
Benjamin Wang 2024-08-16 19:21:34 +01:00 committed by GitHub
commit c12e9555e8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.go-version
View File

@ -1 +1 @@
1.21.13 1.22.6

2
functional/scripts/docker-local-agent.sh
View File

@ -13,7 +13,7 @@ if ! [[ "${0}" =~ "scripts/docker-local-agent.sh" ]]; then
fi fi
if [[ -z "${GO_VERSION}" ]]; then if [[ -z "${GO_VERSION}" ]]; then
GO_VERSION=1.21.13 GO_VERSION=1.22.6
fi fi
echo "Running with GO_VERSION:" ${GO_VERSION} echo "Running with GO_VERSION:" ${GO_VERSION}

2
functional/scripts/docker-local-tester.sh
View File

@ -6,7 +6,7 @@ if ! [[ "${0}" =~ "scripts/docker-local-tester.sh" ]]; then
fi fi
if [[ -z "${GO_VERSION}" ]]; then if [[ -z "${GO_VERSION}" ]]; then
GO_VERSION=1.21.13 GO_VERSION=1.22.6
fi fi
echo "Running with GO_VERSION:" ${GO_VERSION} echo "Running with GO_VERSION:" ${GO_VERSION}

4
go.mod
View File

@ -1,8 +1,8 @@
module go.etcd.io/etcd module go.etcd.io/etcd
go 1.21 go 1.22
toolchain go1.21.13 toolchain go1.22.6
require ( require (
github.com/bgentry/speakeasy v0.1.0 github.com/bgentry/speakeasy v0.1.0

2
pkg/debugutil/pprof.go
View File

@ -36,7 +36,7 @@ func PProfHandlers() map[string]http.Handler {
m[HTTPPrefixPProf+"/profile"] = http.HandlerFunc(pprof.Profile) m[HTTPPrefixPProf+"/profile"] = http.HandlerFunc(pprof.Profile)
m[HTTPPrefixPProf+"/symbol"] = http.HandlerFunc(pprof.Symbol) m[HTTPPrefixPProf+"/symbol"] = http.HandlerFunc(pprof.Symbol)
m[HTTPPrefixPProf+"/cmdline"] = http.HandlerFunc(pprof.Cmdline) 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+"/heap"] = pprof.Handler("heap")
m[HTTPPrefixPProf+"/goroutine"] = pprof.Handler("goroutine") m[HTTPPrefixPProf+"/goroutine"] = pprof.Handler("goroutine")
m[HTTPPrefixPProf+"/threadcreate"] = pprof.Handler("threadcreate") m[HTTPPrefixPProf+"/threadcreate"] = pprof.Handler("threadcreate")

4
tools/mod/go.mod
View File

@ -1,8 +1,8 @@
module go.etcd.io/etcd/tools/v3 module go.etcd.io/etcd/tools/v3
go 1.21 go 1.22
toolchain go1.21.13 toolchain go1.22.6
require ( require (
github.com/gogo/protobuf v1.3.2 github.com/gogo/protobuf v1.3.2