From 05b2e290b821bb1210bcfc259e6f8e85cee3d8e7 Mon Sep 17 00:00:00 2001 From: "Chris S. Kim" Date: Fri, 21 Oct 2022 10:31:09 -0400 Subject: [PATCH] Update go version to 1.19 --- .circleci/config.yml | 22 +++++++++++----------- .github/workflows/build.yml | 20 ++++++++++---------- build-support/docker/Build-Go.dockerfile | 2 +- go.mod | 2 +- test/integration/consul-container/go.mod | 2 +- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1413810f1..1b681772e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,7 +22,7 @@ references: S3_ARTIFACT_BUCKET: consul-dev-artifacts-v2 BASH_ENV: .circleci/bash_env.sh VAULT_BINARY_VERSION: 1.9.4 - GO_VERSION: 1.18.1 + GO_VERSION: 1.19.2 envoy-versions: &supported_envoy_versions - &default_envoy_version "1.20.7" - "1.21.5" @@ -35,7 +35,7 @@ references: images: # When updating the Go version, remember to also update the versions in the # 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 ubuntu: &UBUNTU_CI_IMAGE ubuntu-2004:202201-02 cache: @@ -1069,26 +1069,26 @@ workflows: - dev-build: *filter-ignore-non-go-branches - go-test: requires: [dev-build] - - go-test-lib: - name: "go-test-api go1.17" - path: api - go-version: "1.17" - requires: [dev-build] - go-test-lib: name: "go-test-api go1.18" path: api go-version: "1.18" requires: [dev-build] - go-test-lib: - name: "go-test-sdk go1.17" - path: sdk - go-version: "1.17" - <<: *filter-ignore-non-go-branches + name: "go-test-api go1.19" + path: api + go-version: "1.19" + requires: [ dev-build ] - go-test-lib: name: "go-test-sdk go1.18" path: sdk go-version: "1.18" <<: *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-32bit: *filter-ignore-non-go-branches - noop diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cd31d26b5..d98a84077 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -71,15 +71,15 @@ jobs: strategy: matrix: include: - - {go: "1.18.1", goos: "linux", goarch: "386"} - - {go: "1.18.1", goos: "linux", goarch: "amd64"} - - {go: "1.18.1", goos: "linux", goarch: "arm"} - - {go: "1.18.1", goos: "linux", goarch: "arm64"} - - {go: "1.18.1", goos: "freebsd", goarch: "386"} - - {go: "1.18.1", goos: "freebsd", goarch: "amd64"} - - {go: "1.18.1", goos: "windows", goarch: "386"} - - {go: "1.18.1", goos: "windows", goarch: "amd64"} - - {go: "1.18.1", goos: "solaris", goarch: "amd64"} + - {go: "1.19.2", goos: "linux", goarch: "386"} + - {go: "1.19.2", goos: "linux", goarch: "amd64"} + - {go: "1.19.2", goos: "linux", goarch: "arm"} + - {go: "1.19.2", goos: "linux", goarch: "arm64"} + - {go: "1.19.2", goos: "freebsd", goarch: "386"} + - {go: "1.19.2", goos: "freebsd", goarch: "amd64"} + - {go: "1.19.2", goos: "windows", goarch: "386"} + - {go: "1.19.2", goos: "windows", goarch: "amd64"} + - {go: "1.19.2", goos: "solaris", goarch: "amd64"} fail-fast: true name: Go ${{ matrix.go }} ${{ matrix.goos }} ${{ matrix.goarch }} build @@ -172,7 +172,7 @@ jobs: matrix: goos: [ darwin ] goarch: [ "amd64", "arm64" ] - go: [ "1.18.1" ] + go: [ "1.19.2" ] fail-fast: true name: Go ${{ matrix.go }} ${{ matrix.goos }} ${{ matrix.goarch }} build diff --git a/build-support/docker/Build-Go.dockerfile b/build-support/docker/Build-Go.dockerfile index 52512a1df..cd578b451 100644 --- a/build-support/docker/Build-Go.dockerfile +++ b/build-support/docker/Build-Go.dockerfile @@ -1,4 +1,4 @@ -ARG GOLANG_VERSION=1.18.1 +ARG GOLANG_VERSION=1.19.2 FROM golang:${GOLANG_VERSION} WORKDIR /consul diff --git a/go.mod b/go.mod index fb06f28b1..89f758931 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/consul -go 1.18 +go 1.19 replace github.com/hashicorp/consul/api => ./api diff --git a/test/integration/consul-container/go.mod b/test/integration/consul-container/go.mod index 4f282f40b..9536901cf 100644 --- a/test/integration/consul-container/go.mod +++ b/test/integration/consul-container/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/consul/test/integration/consul-container -go 1.18 +go 1.19 require ( github.com/docker/docker v20.10.11+incompatible