Merge pull request #16394 from jmhbnz/update-to-go-1.20

Migrate to golang 1.20
This commit is contained in:
Benjamin Wang 2023-08-11 07:59:34 +01:00 committed by GitHub
commit 1edd8baf3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 16 additions and 16 deletions

View File

@ -4,7 +4,7 @@
"name": "Go", "name": "Go",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"image": "mcr.microsoft.com/devcontainers/go:1.19-bullseye", "image": "mcr.microsoft.com/devcontainers/go:1.20-bullseye",
// Features to add to the dev container. More info: https://containers.dev/features. // Features to add to the dev container. More info: https://containers.dev/features.
"features": { "features": {

View File

@ -12,7 +12,7 @@ jobs:
# this is to prevent the job to run at forked projects # this is to prevent the job to run at forked projects
if: github.repository == 'etcd-io/etcd' if: github.repository == 'etcd-io/etcd'
runs-on: [self-hosted, Linux, ARM64] runs-on: [self-hosted, Linux, ARM64]
container: golang:1.19-bullseye container: golang:1.20-bullseye
defaults: defaults:
run: run:
shell: bash shell: bash

View File

@ -27,7 +27,7 @@ jobs:
timeout-minutes: 210 timeout-minutes: 210
runs-on: ${{ fromJson(inputs.runs-on) }} runs-on: ${{ fromJson(inputs.runs-on) }}
container: container:
image: golang:1.19-bullseye image: golang:1.20-bullseye
# Required for mounting fuse lazyfs # Required for mounting fuse lazyfs
options: --privileged options: --privileged
defaults: defaults:

View File

@ -17,7 +17,7 @@ jobs:
# this is to prevent the job to run at forked projects # this is to prevent the job to run at forked projects
if: github.repository == 'etcd-io/etcd' if: github.repository == 'etcd-io/etcd'
runs-on: [self-hosted, Linux, ARM64] runs-on: [self-hosted, Linux, ARM64]
container: golang:1.19-bullseye container: golang:1.20-bullseye
defaults: defaults:
run: run:
shell: bash shell: bash

View File

@ -1 +1 @@
1.19.12 1.20.7

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.1 github.com/coreos/go-semver v0.3.1

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 (
go.etcd.io/etcd/api/v3 v3.6.0-alpha.0 go.etcd.io/etcd/api/v3 v3.6.0-alpha.0

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.5.0 github.com/coreos/go-systemd/v22 v22.5.0

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/coreos/go-semver v0.3.1 github.com/coreos/go-semver v0.3.1

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

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

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.18 github.com/creack/pty v1.1.18

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.1 github.com/coreos/go-semver v0.3.1

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

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/alexfalkowski/gocovmerge v1.1.8 github.com/alexfalkowski/gocovmerge v1.1.8