diff --git a/.circleci/config.yml b/.circleci/config.yml index c4fde02e76..09b6db432c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -120,12 +120,12 @@ jobs: environment: - CIRCLECI_CLI_VERSION: 0.1.5546 - GO_TAGS: '' - - GO_VERSION: 1.18.4 + - GO_VERSION: 1.18.5 - GOFUMPT_VERSION: 0.2.1 - GOTESTSUM_VERSION: 0.5.2 test-go-remote-docker: docker: - - image: docker.mirror.hashicorp.services/cimg/go:1.18.4 + - image: docker.mirror.hashicorp.services/cimg/go:1.18.5 resource_class: medium working_directory: /home/circleci/go/src/github.com/hashicorp/vault parallelism: 8 @@ -258,7 +258,7 @@ jobs: -e NO_PROXY \ -e VAULT_TEST_LOG_DIR=/tmp/testlogs \ --network vaulttest --name \ - testcontainer docker.mirror.hashicorp.services/cimg/go:1.18.4 \ + testcontainer docker.mirror.hashicorp.services/cimg/go:1.18.5 \ tail -f /dev/null # Run tests @@ -359,12 +359,12 @@ jobs: environment: - CIRCLECI_CLI_VERSION: 0.1.5546 - GO_TAGS: '' - - GO_VERSION: 1.18.4 + - GO_VERSION: 1.18.5 - GOFUMPT_VERSION: 0.2.1 - GOTESTSUM_VERSION: 0.5.2 test-go-race: docker: - - image: docker.mirror.hashicorp.services/cimg/go:1.18.4 + - image: docker.mirror.hashicorp.services/cimg/go:1.18.5 resource_class: xlarge working_directory: /home/circleci/go/src/github.com/hashicorp/vault parallelism: 8 @@ -493,7 +493,7 @@ jobs: -e NO_PROXY \ -e VAULT_TEST_LOG_DIR=/tmp/testlogs \ --network vaulttest --name \ - testcontainer docker.mirror.hashicorp.services/cimg/go:1.18.4 \ + testcontainer docker.mirror.hashicorp.services/cimg/go:1.18.5 \ tail -f /dev/null # Run tests @@ -551,7 +551,7 @@ jobs: - GO_TAGS: '' test-go: docker: - - image: docker.mirror.hashicorp.services/cimg/go:1.18.4 + - image: docker.mirror.hashicorp.services/cimg/go:1.18.5 resource_class: large working_directory: /home/circleci/go/src/github.com/hashicorp/vault parallelism: 8 @@ -680,7 +680,7 @@ jobs: -e NO_PROXY \ -e VAULT_TEST_LOG_DIR=/tmp/testlogs \ --network vaulttest --name \ - testcontainer docker.mirror.hashicorp.services/cimg/go:1.18.4 \ + testcontainer docker.mirror.hashicorp.services/cimg/go:1.18.5 \ tail -f /dev/null # Run tests @@ -839,12 +839,12 @@ jobs: environment: - CIRCLECI_CLI_VERSION: 0.1.5546 - GO_TAGS: '' - - GO_VERSION: 1.18.4 + - GO_VERSION: 1.18.5 - GOFUMPT_VERSION: 0.2.1 - GOTESTSUM_VERSION: 0.5.2 test-go-race-remote-docker: docker: - - image: docker.mirror.hashicorp.services/cimg/go:1.18.4 + - image: docker.mirror.hashicorp.services/cimg/go:1.18.5 resource_class: medium working_directory: /home/circleci/go/src/github.com/hashicorp/vault parallelism: 8 @@ -977,7 +977,7 @@ jobs: -e NO_PROXY \ -e VAULT_TEST_LOG_DIR=/tmp/testlogs \ --network vaulttest --name \ - testcontainer docker.mirror.hashicorp.services/cimg/go:1.18.4 \ + testcontainer docker.mirror.hashicorp.services/cimg/go:1.18.5 \ tail -f /dev/null # Run tests diff --git a/.circleci/config/commands/go_test.yml b/.circleci/config/commands/go_test.yml index 874a76dbc8..74f73e2e2e 100644 --- a/.circleci/config/commands/go_test.yml +++ b/.circleci/config/commands/go_test.yml @@ -14,7 +14,7 @@ parameters: default: false go_image: type: string - default: "docker.mirror.hashicorp.services/cimg/go:1.18.4" + default: "docker.mirror.hashicorp.services/cimg/go:1.18.5" use_docker: type: boolean default: false diff --git a/.circleci/config/executors/@executors.yml b/.circleci/config/executors/@executors.yml index 89e158788b..30010a1a8e 100644 --- a/.circleci/config/executors/@executors.yml +++ b/.circleci/config/executors/@executors.yml @@ -4,7 +4,7 @@ go-machine: shell: /usr/bin/env bash -euo pipefail -c environment: CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3) - GO_VERSION: 1.18.4 # Pin Go to patch version (ex: 1.2.3) + GO_VERSION: 1.18.5 # Pin Go to patch version (ex: 1.2.3) GOTESTSUM_VERSION: 0.5.2 # Pin gotestsum to patch version (ex: 1.2.3) GOFUMPT_VERSION: 0.2.1 # Pin gofumpt to patch version (ex: 1.2.3) GO_TAGS: "" @@ -30,7 +30,7 @@ semgrep: docker-env-go-test-remote-docker: resource_class: medium docker: - - image: "docker.mirror.hashicorp.services/cimg/go:1.18.4" + - image: "docker.mirror.hashicorp.services/cimg/go:1.18.5" environment: CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3) GO_TAGS: "" @@ -38,7 +38,7 @@ docker-env-go-test-remote-docker: docker-env-go-test: resource_class: large docker: - - image: "docker.mirror.hashicorp.services/cimg/go:1.18.4" + - image: "docker.mirror.hashicorp.services/cimg/go:1.18.5" environment: CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3) GO_TAGS: "" @@ -46,7 +46,7 @@ docker-env-go-test: docker-env-go-test-race: resource_class: xlarge docker: - - image: "docker.mirror.hashicorp.services/cimg/go:1.18.4" + - image: "docker.mirror.hashicorp.services/cimg/go:1.18.5" environment: CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3) GO_TAGS: "" diff --git a/Makefile b/Makefile index bccecfe6ff..43e8b1051b 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ EXTERNAL_TOOLS=\ GOFMT_FILES?=$$(find . -name '*.go' | grep -v pb.go | grep -v vendor) -GO_VERSION_MIN=1.18.4 +GO_VERSION_MIN=1.18.5 GO_CMD?=go CGO_ENABLED?=0 ifneq ($(FDB_ENABLED), ) diff --git a/README.md b/README.md index 6293a3633d..6dcf868a89 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,7 @@ Developing Vault If you wish to work on Vault itself or any of its built-in systems, you'll first need [Go](https://www.golang.org) installed on your machine. Go version -1.18.4+ is *required*. +1.18.5+ is *required*. For local dev first make sure Go is properly installed, including setting up a [GOPATH](https://golang.org/doc/code.html#GOPATH). Ensure that `$GOPATH/bin` is in diff --git a/changelog/_go-ver-1120.txt b/changelog/_go-ver-1120.txt index 911ed775fb..ac8890f346 100644 --- a/changelog/_go-ver-1120.txt +++ b/changelog/_go-ver-1120.txt @@ -1,3 +1,3 @@ ```release-note:change -core: Bump Go version to 1.18.4. +core: Bump Go version to 1.18.5. ``` diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile index 5a29c49314..e4ad88b6c1 100644 --- a/scripts/docker/Dockerfile +++ b/scripts/docker/Dockerfile @@ -1,6 +1,6 @@ # Multi-stage builder to avoid polluting users environment with wrong # architecture binaries. -ARG VERSION=1.18.4 +ARG VERSION=1.18.5 FROM golang:${VERSION} AS builder diff --git a/scripts/docker/Dockerfile.ui b/scripts/docker/Dockerfile.ui index 595af6a3d5..55838df734 100644 --- a/scripts/docker/Dockerfile.ui +++ b/scripts/docker/Dockerfile.ui @@ -2,7 +2,7 @@ # architecture binaries. This file only currently works for linux/amd64. FROM debian:buster AS builder -ARG VERSION=1.18.4 +ARG VERSION=1.18.5 ARG CGO_ENABLED=0 ARG BUILD_TAGS ENV JOBS=2