From 5cd5c2c9ee3ca9fceb717106e24c15a8eeb78d1a Mon Sep 17 00:00:00 2001 From: Mahmood Ali Date: Fri, 1 Oct 2021 09:41:25 -0400 Subject: [PATCH] build: Update to golang 1.17.1 --- .circleci/config.yml | 8 ++++---- contributing/README.md | 2 +- scripts/release/mac-remote-build | 2 +- scripts/update_golang_version.sh | 2 +- scripts/vagrant-linux-priv-go.sh | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2dd81ad02..228ae36cd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -512,7 +512,7 @@ executors: go: working_directory: /go/src/github.com/hashicorp/nomad docker: - - image: docker.mirror.hashicorp.services/golang:1.16.7 + - image: docker.mirror.hashicorp.services/golang:1.17.1 environment: <<: *common_envs GOPATH: /go @@ -524,7 +524,7 @@ executors: environment: &machine_env <<: *common_envs GOPATH: /home/circleci/go - GOLANG_VERSION: 1.16.7 + GOLANG_VERSION: 1.17.1 # uses a more recent image with unattended upgrades disabled properly # but seems to break docker builds @@ -541,7 +541,7 @@ executors: environment: <<: *common_envs GOPATH: /Users/distiller/go - GOLANG_VERSION: 1.16.7 + GOLANG_VERSION: 1.17.1 go-windows: machine: @@ -553,7 +553,7 @@ executors: GOPATH: c:\gopath GOBIN: c:\gopath\bin GOTESTSUM_PATH: c:\tmp\test-reports - GOLANG_VERSION: 1.16.7 + GOLANG_VERSION: 1.17.1 GOTESTSUM_VERSION: 0.4.2 VAULT_VERSION: 1.4.1 diff --git a/contributing/README.md b/contributing/README.md index 4e9f8ebe8..945e35d80 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.16.7+](https://golang.org/) *(Note: `gcc-go` is not supported)* +1. Install [Go 1.17.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 92c3849cc..0222e2d43 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.16.7" + local go_version="1.17.1" 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 7d60c3465..89854b0ee 100755 --- a/scripts/update_golang_version.sh +++ b/scripts/update_golang_version.sh @@ -30,7 +30,7 @@ sed -i'' -e "s|go_version=\"*[^\"]*\"*$|go_version=\"${golang_version}\"|g" \ scripts/vagrant-linux-priv-go.sh scripts/release/mac-remote-build echo "--> Checking if there is any remaining references to old versions..." -if git grep -I --fixed-strings "${current_version}" | grep -v -e CHANGELOG.md -e vendor/ -e website/ -e ui/ -e contributing/golang.md -e '.*.go:' -e go.sum -e go.mod -e LICENSE +if git grep -I --fixed-strings "${current_version}" | grep -v -e CHANGELOG.md -e .changelog/ -e vendor/ -e website/ -e ui/ -e contributing/golang.md -e '.*.go:' -e go.sum -e go.mod -e LICENSE then echo " ^^ files may contain references to old golang version" >&2 echo " update script and run again" >&2 diff --git a/scripts/vagrant-linux-priv-go.sh b/scripts/vagrant-linux-priv-go.sh index 6ee1eaeca..fd85d5bcc 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.16.7" + local go_version="1.17.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