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 #16401 from jmhbnz/update-to-go-1.20

Browse Source 
[3.5] Backport update to golang 1.20 minor release
This commit is contained in:
Benjamin Wang 2023-08-17 19:11:43 +08:00 committed by GitHub
commit 2d2e75dd8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.go-version
View File

@ -1 +1 @@
1.19.12 1.20.7

2
Makefile
View File

@ -55,7 +55,7 @@ docker-remove:
GO_VERSION ?= 1.19.9 GO_VERSION ?= 1.20.7
ETCD_VERSION ?= $(shell git rev-parse --short HEAD || echo "GitNotFound") ETCD_VERSION ?= $(shell git rev-parse --short HEAD || echo "GitNotFound")
TEST_SUFFIX = $(shell date +%s | base64 | head -c 15) TEST_SUFFIX = $(shell date +%s | base64 | head -c 15)

2
api/go.mod
View File

@ -1,6 +1,6 @@
module go.etcd.io/etcd/api/v3 module go.etcd.io/etcd/api/v3
go 1.19 go 1.20
require ( require (
github.com/coreos/go-semver v0.3.0 github.com/coreos/go-semver v0.3.0

2
client/pkg/go.mod
View File

@ -1,6 +1,6 @@
module go.etcd.io/etcd/client/pkg/v3 module go.etcd.io/etcd/client/pkg/v3
go 1.19 go 1.20
require ( require (
github.com/coreos/go-systemd/v22 v22.3.2 github.com/coreos/go-systemd/v22 v22.3.2

2
client/v2/go.mod
View File

@ -1,6 +1,6 @@
module go.etcd.io/etcd/client/v2 module go.etcd.io/etcd/client/v2
go 1.19 go 1.20
require ( require (
github.com/json-iterator/go v1.1.11 github.com/json-iterator/go v1.1.11

2
client/v3/go.mod
View File

@ -1,6 +1,6 @@
module go.etcd.io/etcd/client/v3 module go.etcd.io/etcd/client/v3
go 1.19 go 1.20
require ( require (
github.com/dustin/go-humanize v1.0.0 github.com/dustin/go-humanize v1.0.0

2
etcdctl/go.mod
View File

@ -1,6 +1,6 @@
module go.etcd.io/etcd/etcdctl/v3 module go.etcd.io/etcd/etcdctl/v3
go 1.19 go 1.20
require ( require (
github.com/bgentry/speakeasy v0.1.0 github.com/bgentry/speakeasy v0.1.0

2
etcdutl/go.mod
View File

@ -1,6 +1,6 @@
module go.etcd.io/etcd/etcdutl/v3 module go.etcd.io/etcd/etcdutl/v3
go 1.19 go 1.20
replace ( replace (
go.etcd.io/etcd/api/v3 => ../api go.etcd.io/etcd/api/v3 => ../api

2
go.mod
View File

@ -1,6 +1,6 @@
module go.etcd.io/etcd/v3 module go.etcd.io/etcd/v3
go 1.19 go 1.20
replace ( replace (
go.etcd.io/etcd/api/v3 => ./api go.etcd.io/etcd/api/v3 => ./api

2
pkg/go.mod
View File

@ -1,6 +1,6 @@
module go.etcd.io/etcd/pkg/v3 module go.etcd.io/etcd/pkg/v3
go 1.19 go 1.20
require ( require (
github.com/creack/pty v1.1.11 github.com/creack/pty v1.1.11

2
raft/go.mod
View File

@ -1,6 +1,6 @@
module go.etcd.io/etcd/raft/v3 module go.etcd.io/etcd/raft/v3
go 1.19 go 1.20
require ( require (
github.com/cockroachdb/datadriven v1.0.2 github.com/cockroachdb/datadriven v1.0.2

2
server/etcdserver/api/rafthttp/transport.go
View File

@ -110,7 +110,7 @@ type Transport struct {
Raft Raft // raft state machine, to which the Transport forwards received messages and reports status Raft Raft // raft state machine, to which the Transport forwards received messages and reports status
Snapshotter *snap.Snapshotter Snapshotter *snap.Snapshotter
ServerStats *stats.ServerStats // used to record general transportation statistics ServerStats *stats.ServerStats // used to record general transportation statistics
// used to record transportation statistics with followers when // LeaderStats is used to record transportation statistics with followers when
// performing as leader in raft protocol // performing as leader in raft protocol
LeaderStats *stats.LeaderStats LeaderStats *stats.LeaderStats
// ErrorC is used to report detected critical errors, e.g., // ErrorC is used to report detected critical errors, e.g.,

2
server/go.mod
View File

@ -1,6 +1,6 @@
module go.etcd.io/etcd/server/v3 module go.etcd.io/etcd/server/v3
go 1.19 go 1.20
require ( require (
github.com/coreos/go-semver v0.3.0 github.com/coreos/go-semver v0.3.0

2
tests/go.mod
View File

@ -1,6 +1,6 @@
module go.etcd.io/etcd/tests/v3 module go.etcd.io/etcd/tests/v3
go 1.19 go 1.20
replace ( replace (
go.etcd.io/etcd/api/v3 => ../api go.etcd.io/etcd/api/v3 => ../api

2
tools/mod/go.mod
View File

@ -1,6 +1,6 @@
module go.etcd.io/etcd/tools/v3 module go.etcd.io/etcd/tools/v3
go 1.19 go 1.20
require ( require (
github.com/akhenakh/hunspellgo v0.0.0-20160221122622-9db38fa26e19 // indirect github.com/akhenakh/hunspellgo v0.0.0-20160221122622-9db38fa26e19 // indirect