diff --git a/.circleci/config.yml b/.circleci/config.yml index 41234d7e5fc..0ad5eed9cb1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -430,7 +430,7 @@ executors: go: working_directory: /go/src/github.com/hashicorp/nomad docker: - - image: docker.mirror.hashicorp.services/golang:1.15.5 + - image: docker.mirror.hashicorp.services/golang:1.15.6 environment: <<: *common_envs GOPATH: /go @@ -442,7 +442,7 @@ executors: environment: &machine_env <<: *common_envs GOPATH: /home/circleci/go - GOLANG_VERSION: 1.15.5 + GOLANG_VERSION: 1.15.6 # uses a more recent image with unattended upgrades disabled properly # but seems to break docker builds @@ -459,7 +459,7 @@ executors: environment: <<: *common_envs GOPATH: /Users/distiller/go - GOLANG_VERSION: 1.15.5 + GOLANG_VERSION: 1.15.6 go-windows: machine: @@ -471,7 +471,7 @@ executors: GOPATH: c:\gopath GOBIN: c:\gopath\bin GOTESTSUM_PATH: c:\tmp\test-reports - GOLANG_VERSION: 1.15.5 + GOLANG_VERSION: 1.15.6 GOTESTSUM_VERSION: 0.4.2 VAULT_VERSION: 1.4.1 diff --git a/CHANGELOG.md b/CHANGELOG.md index dfbad0040f0..010ad3a5e86 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## 1.0.2 (Unreleased) IMPROVEMENTS: + * build: Updated to Go 1.15.6. [[GH-9686](https://github.com/hashicorp/nomad/issues/9686)] * consul/connect: interpolate the connect, service meta, and service canary meta blocks with the task environment [[GH-9586](https://github.com/hashicorp/nomad/pull/9586)] BUG FIXES: diff --git a/contributing/README.md b/contributing/README.md index 91c9a1b73e4..f3ab5cfbbeb 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.15.5+](https://golang.org/) *(Note: `gcc-go` is not supported)* +1. Install [Go 1.15.6+](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/contributing/golang.md b/contributing/golang.md index 6a74894e6d8..3ea26a3d0df 100644 --- a/contributing/golang.md +++ b/contributing/golang.md @@ -12,6 +12,7 @@ version. | Nomad Version | Go Version | |:-------------:|:----------:| +| 1.0.2 | 1.15.6 | | 1.0 | 1.15.5 | | 0.12.2 | 1.14.7 | | 0.12.1 | 1.14.6 | diff --git a/scripts/release/mac-remote-build b/scripts/release/mac-remote-build index f66e5b61f43..15969aa0d39 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.15.5" + local go_version="1.15.6" local download= download="https://storage.googleapis.com/golang/go${go_version}.darwin-amd64.tar.gz" diff --git a/scripts/update_golang_version.sh b/scripts/update_golang_version.sh index e2127232cb6..5fc5afdda3c 100755 --- a/scripts/update_golang_version.sh +++ b/scripts/update_golang_version.sh @@ -9,16 +9,19 @@ fi golang_version="$1" -current_version=$(grep -o -e 'golang:[.0-9]*' .circleci/config.yml | head -n1 | cut -d: -f2) +current_version=$(grep -o -E -e '/golang:[.0-9]+' .circleci/config.yml | head -n1 | cut -d: -f2) +if [ -z "${current_version}" ]; then + echo "unable to find current go version" + exit 1 +fi echo "--> Replacing Go ${current_version} with Go ${golang_version} ..." # To support both GNU and BSD sed, the regex is looser than it needs to be. # Specifically, we use "* instead of "?, which relies on GNU extension without much loss of # correctness in practice. -sed -i'' -e "s|golang:[.0-9]*|golang:${golang_version}|g" \ - .circleci/config/config.yml .circleci/config.yml +sed -i'' -e "s|/golang:[.0-9]*|/golang:${golang_version}|g" .circleci/config.yml sed -i'' -e "s|GOLANG_VERSION:[ \"]*[.0-9]*\"*|GOLANG_VERSION: ${golang_version}|g" \ - .circleci/config/config.yml .circleci/config.yml + .circleci/config.yml sed -i'' -e "s|\\(golang.org.*version\\) [.0-9]*|\\1 ${golang_version}|g" \ README.md diff --git a/scripts/vagrant-linux-priv-go.sh b/scripts/vagrant-linux-priv-go.sh index 42f307c74a8..5e81bbafcfe 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.15.5" + local go_version="1.15.6" local download="https://storage.googleapis.com/golang/go${go_version}.linux-amd64.tar.gz" if go version 2>&1 | grep -q "${go_version}"; then