Update go version to 1.19

This commit is contained in:
Chris S. Kim 2022-10-21 10:31:09 -04:00 committed by Chris S. Kim
parent a5acb987fa
commit 05b2e290b8
5 changed files with 24 additions and 24 deletions

View File

@ -22,7 +22,7 @@ references:
S3_ARTIFACT_BUCKET: consul-dev-artifacts-v2 S3_ARTIFACT_BUCKET: consul-dev-artifacts-v2
BASH_ENV: .circleci/bash_env.sh BASH_ENV: .circleci/bash_env.sh
VAULT_BINARY_VERSION: 1.9.4 VAULT_BINARY_VERSION: 1.9.4
GO_VERSION: 1.18.1 GO_VERSION: 1.19.2
envoy-versions: &supported_envoy_versions envoy-versions: &supported_envoy_versions
- &default_envoy_version "1.20.7" - &default_envoy_version "1.20.7"
- "1.21.5" - "1.21.5"
@ -35,7 +35,7 @@ references:
images: images:
# When updating the Go version, remember to also update the versions in the # When updating the Go version, remember to also update the versions in the
# workflows section for go-test-lib jobs. # workflows section for go-test-lib jobs.
go: &GOLANG_IMAGE docker.mirror.hashicorp.services/cimg/go:1.18.1 go: &GOLANG_IMAGE docker.mirror.hashicorp.services/cimg/go:1.19.2
ember: &EMBER_IMAGE docker.mirror.hashicorp.services/circleci/node:14-browsers ember: &EMBER_IMAGE docker.mirror.hashicorp.services/circleci/node:14-browsers
ubuntu: &UBUNTU_CI_IMAGE ubuntu-2004:202201-02 ubuntu: &UBUNTU_CI_IMAGE ubuntu-2004:202201-02
cache: cache:
@ -1069,26 +1069,26 @@ workflows:
- dev-build: *filter-ignore-non-go-branches - dev-build: *filter-ignore-non-go-branches
- go-test: - go-test:
requires: [dev-build] requires: [dev-build]
- go-test-lib:
name: "go-test-api go1.17"
path: api
go-version: "1.17"
requires: [dev-build]
- go-test-lib: - go-test-lib:
name: "go-test-api go1.18" name: "go-test-api go1.18"
path: api path: api
go-version: "1.18" go-version: "1.18"
requires: [dev-build] requires: [dev-build]
- go-test-lib: - go-test-lib:
name: "go-test-sdk go1.17" name: "go-test-api go1.19"
path: sdk path: api
go-version: "1.17" go-version: "1.19"
<<: *filter-ignore-non-go-branches requires: [ dev-build ]
- go-test-lib: - go-test-lib:
name: "go-test-sdk go1.18" name: "go-test-sdk go1.18"
path: sdk path: sdk
go-version: "1.18" go-version: "1.18"
<<: *filter-ignore-non-go-branches <<: *filter-ignore-non-go-branches
- go-test-lib:
name: "go-test-sdk go1.19"
path: sdk
go-version: "1.19"
<<: *filter-ignore-non-go-branches
- go-test-race: *filter-ignore-non-go-branches - go-test-race: *filter-ignore-non-go-branches
- go-test-32bit: *filter-ignore-non-go-branches - go-test-32bit: *filter-ignore-non-go-branches
- noop - noop

View File

@ -71,15 +71,15 @@ jobs:
strategy: strategy:
matrix: matrix:
include: include:
- {go: "1.18.1", goos: "linux", goarch: "386"} - {go: "1.19.2", goos: "linux", goarch: "386"}
- {go: "1.18.1", goos: "linux", goarch: "amd64"} - {go: "1.19.2", goos: "linux", goarch: "amd64"}
- {go: "1.18.1", goos: "linux", goarch: "arm"} - {go: "1.19.2", goos: "linux", goarch: "arm"}
- {go: "1.18.1", goos: "linux", goarch: "arm64"} - {go: "1.19.2", goos: "linux", goarch: "arm64"}
- {go: "1.18.1", goos: "freebsd", goarch: "386"} - {go: "1.19.2", goos: "freebsd", goarch: "386"}
- {go: "1.18.1", goos: "freebsd", goarch: "amd64"} - {go: "1.19.2", goos: "freebsd", goarch: "amd64"}
- {go: "1.18.1", goos: "windows", goarch: "386"} - {go: "1.19.2", goos: "windows", goarch: "386"}
- {go: "1.18.1", goos: "windows", goarch: "amd64"} - {go: "1.19.2", goos: "windows", goarch: "amd64"}
- {go: "1.18.1", goos: "solaris", goarch: "amd64"} - {go: "1.19.2", goos: "solaris", goarch: "amd64"}
fail-fast: true fail-fast: true
name: Go ${{ matrix.go }} ${{ matrix.goos }} ${{ matrix.goarch }} build name: Go ${{ matrix.go }} ${{ matrix.goos }} ${{ matrix.goarch }} build
@ -172,7 +172,7 @@ jobs:
matrix: matrix:
goos: [ darwin ] goos: [ darwin ]
goarch: [ "amd64", "arm64" ] goarch: [ "amd64", "arm64" ]
go: [ "1.18.1" ] go: [ "1.19.2" ]
fail-fast: true fail-fast: true
name: Go ${{ matrix.go }} ${{ matrix.goos }} ${{ matrix.goarch }} build name: Go ${{ matrix.go }} ${{ matrix.goos }} ${{ matrix.goarch }} build

View File

@ -1,4 +1,4 @@
ARG GOLANG_VERSION=1.18.1 ARG GOLANG_VERSION=1.19.2
FROM golang:${GOLANG_VERSION} FROM golang:${GOLANG_VERSION}
WORKDIR /consul WORKDIR /consul

2
go.mod
View File

@ -1,6 +1,6 @@
module github.com/hashicorp/consul module github.com/hashicorp/consul
go 1.18 go 1.19
replace github.com/hashicorp/consul/api => ./api replace github.com/hashicorp/consul/api => ./api

View File

@ -1,6 +1,6 @@
module github.com/hashicorp/consul/test/integration/consul-container module github.com/hashicorp/consul/test/integration/consul-container
go 1.18 go 1.19
require ( require (
github.com/docker/docker v20.10.11+incompatible github.com/docker/docker v20.10.11+incompatible