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 #17368 from dusk125/3.4-to-go1.21

Browse Source 
[3.4] Update to go1.21
This commit is contained in:
Benjamin Wang 2024-02-05 16:18:00 +00:00 committed by GitHub
commit 6301cf3a42
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.go-version
View File

@ -1 +1 @@
1.20.13
1.21.6

2
Makefile
View File

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

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

@ -13,7 +13,7 @@ if ! [[ "${0}" =~ "scripts/docker-local-agent.sh" ]]; then
fi
if [[ -z "${GO_VERSION}" ]]; then
GO_VERSION=1.20.13
GO_VERSION=1.21.6
fi
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
if [[ -z "${GO_VERSION}" ]]; then
GO_VERSION=1.20.13
GO_VERSION=1.21.6
fi
echo "Running with GO_VERSION:" ${GO_VERSION}

2
go.mod
View File

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

2
tools/mod/go.mod
View File

@ -1,6 +1,6 @@
module go.etcd.io/etcd/tools/v3
go 1.20
go 1.21
require (
github.com/gogo/protobuf v1.3.2