diff --git a/.changelog/16182.txt b/.changelog/16182.txt new file mode 100644 index 000000000..bd2437dfa --- /dev/null +++ b/.changelog/16182.txt @@ -0,0 +1,3 @@ +```release-note:security +build: Update to go1.20.1 +``` diff --git a/.circleci/config.yml b/.circleci/config.yml index 5fc51378d..322b11317 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -75,7 +75,7 @@ commands: command: | set -x - echo installing golang 1.20 + echo installing golang ${GO_VERSION} case "${OSTYPE}" in linux*) os="linux" ;; @@ -88,13 +88,13 @@ commands: then sudo rm -rf << parameters.target_directory >>/go sudo mkdir -p << parameters.target_directory >> - curl -SL --fail -o /tmp/golang.tar.gz https://dl.google.com/go/go1.20.${os}-amd64.tar.gz + curl -SL --fail -o /tmp/golang.tar.gz https://dl.google.com/go/go${GOLANG_VERSION}.${os}-amd64.tar.gz sudo tar -C << parameters.target_directory >> -xzf /tmp/golang.tar.gz rm -rf /tmp/golang.tar.gz else rm -rf << parameters.target_directory >>/go mkdir -p <> - curl -SL --fail -o /tmp/go.zip https://dl.google.com/go/go1.20.windows-amd64.zip + curl -SL --fail -o /tmp/go.zip https://dl.google.com/go/go${GOLANG_VERSION}.windows-amd64.zip unzip -q -o /tmp/go.zip -d << parameters.target_directory >> rm -rf /tmp/go.zip fi @@ -372,7 +372,7 @@ jobs: ./scripts/vagrant-linux-unpriv-ui.sh export PATH="$GOPATH/bin:/usr/local/go/bin:$PATH" - + source ${BASH_ENV} . ~/.nvm/nvm.sh cd ui && yarn install --frozen-lockfile && cd .. @@ -450,7 +450,7 @@ executors: go: working_directory: /go/src/github.com/hashicorp/nomad docker: - - image: docker.mirror.hashicorp.services/golang:1.20 + - image: docker.mirror.hashicorp.services/golang:1.20.1 resource_class: medium environment: <<: *common_envs @@ -463,7 +463,7 @@ executors: resource_class: large environment: &machine_env <<: *common_envs - GOLANG_VERSION: '1.20' + GOLANG_VERSION: 1.20.1 go-macos: working_directory: ~/go/src/github.com/hashicorp/nomad @@ -472,7 +472,7 @@ executors: environment: <<: *common_envs GOPATH: /Users/distiller/go - GOLANG_VERSION: '1.20' + GOLANG_VERSION: 1.20.1 go-windows: machine: @@ -484,7 +484,7 @@ executors: GOPATH: c:\gopath GOBIN: c:\gopath\bin GOTESTSUM_PATH: c:\tmp\test-reports - GOLANG_VERSION: '1.20' + GOLANG_VERSION: 1.20.1 GOTESTSUM_VERSION: 1.7.0 VAULT_VERSION: 1.4.1 diff --git a/.go-version b/.go-version index 5fb5a6b4f..0044d6cb9 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.20 +1.20.1 diff --git a/contributing/README.md b/contributing/README.md index 5075d8f95..ef54372ba 100644 --- a/contributing/README.md +++ b/contributing/README.md @@ -30,7 +30,7 @@ A development environment is supplied via Vagrant to make getting started easier Developing without Vagrant --- -1. Install [Go 1.20+](https://golang.org/) *(Note: `gcc-go` is not supported)* +1. Install [Go 1.20.1+](https://golang.org/) *(Note: `gcc-go` is not supported)* 1. Clone this repo ```sh $ git clone https://github.com/hashicorp/nomad.git diff --git a/scripts/release/mac-remote-build b/scripts/release/mac-remote-build index 75f369379..05791d654 100755 --- a/scripts/release/mac-remote-build +++ b/scripts/release/mac-remote-build @@ -56,7 +56,7 @@ REPO_PATH="${TMP_WORKSPACE}/gopath/src/github.com/hashicorp/nomad" mkdir -p "${TMP_WORKSPACE}/tmp" install_go() { - local go_version="1.20" + local go_version="1.20.1" local download= download="https://storage.googleapis.com/golang/go${go_version}.darwin-amd64.tar.gz" diff --git a/scripts/vagrant-linux-priv-go.sh b/scripts/vagrant-linux-priv-go.sh index 0fc56c94e..fa166944e 100755 --- a/scripts/vagrant-linux-priv-go.sh +++ b/scripts/vagrant-linux-priv-go.sh @@ -3,7 +3,7 @@ set -o errexit function install_go() { - local go_version="1.20" + local go_version="1.20.1" local download="https://storage.googleapis.com/golang/go${go_version}.linux-amd64.tar.gz" if go version 2>&1 | grep -q "${go_version}"; then