From 94e81bb4f67de31c757d713f0255b32bae6c5ed2 Mon Sep 17 00:00:00 2001 From: Mahmood Ali Date: Sat, 16 May 2020 11:33:15 -0400 Subject: [PATCH] Merge pull request #7970 from hashicorp/go1.14.3 Go1.14.3 --- .circleci/config.yml | 28 ++++++++++++++-------------- .circleci/config/config.yml | 8 ++++---- README.md | 2 +- scripts/release/mac-remote-build | 2 +- scripts/update_golang_version.sh | 7 +++++++ scripts/vagrant-linux-priv-go.sh | 2 +- 6 files changed, 28 insertions(+), 21 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2f656dc42c9d..15d665df8164 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,7 +10,7 @@ jobs: working_directory: ~/go/src/github.com/hashicorp/nomad environment: - GIT_PAGER: cat - - GOLANG_VERSION: 1.14.1 + - GOLANG_VERSION: 1.14.3 - GOMAXPROCS: 1 - GOPATH: /home/circleci/go - GOTESTSUM_JSONFILE: /tmp/test-reports/testjsonfile.json @@ -122,7 +122,7 @@ jobs: working_directory: ~/go/src/github.com/hashicorp/nomad environment: - GIT_PAGER: cat - - GOLANG_VERSION: 1.14.1 + - GOLANG_VERSION: 1.14.3 - GOMAXPROCS: 1 - GOPATH: /home/circleci/go - GOTESTSUM_JSONFILE: /tmp/test-reports/testjsonfile.json @@ -234,7 +234,7 @@ jobs: working_directory: ~/go/src/github.com/hashicorp/nomad environment: - GIT_PAGER: cat - - GOLANG_VERSION: 1.14.1 + - GOLANG_VERSION: 1.14.3 - GOMAXPROCS: 1 - GOPATH: /home/circleci/go - GOTESTSUM_JSONFILE: /tmp/test-reports/testjsonfile.json @@ -346,7 +346,7 @@ jobs: working_directory: ~/go/src/github.com/hashicorp/nomad environment: - GIT_PAGER: cat - - GOLANG_VERSION: 1.14.1 + - GOLANG_VERSION: 1.14.3 - GOMAXPROCS: 1 - GOPATH: /home/circleci/go - GOTESTSUM_JSONFILE: /tmp/test-reports/testjsonfile.json @@ -550,7 +550,7 @@ jobs: path: c:\tmp\test-reports environment: - GOBIN: c:\gopath\bin - - GOLANG_VERSION: 1.14.1 + - GOLANG_VERSION: 1.14.3 - GOPATH: c:\gopath - GOTESTSUM_PATH: c:\tmp\test-reports - GOTESTSUM_VERSION: 0.4.2 @@ -563,7 +563,7 @@ jobs: working_directory: ~/go/src/github.com/hashicorp/nomad environment: - GIT_PAGER: cat - - GOLANG_VERSION: 1.14.1 + - GOLANG_VERSION: 1.14.3 - GOMAXPROCS: 1 - GOPATH: /home/circleci/go - GOTESTSUM_JSONFILE: /tmp/test-reports/testjsonfile.json @@ -702,7 +702,7 @@ jobs: path: /tmp/test-reports lint-go: docker: - - image: golang:1.14.1 + - image: golang:1.14.3 working_directory: /go/src/github.com/hashicorp/nomad steps: - checkout @@ -766,7 +766,7 @@ jobs: working_directory: ~/go/src/github.com/hashicorp/nomad environment: - GIT_PAGER: cat - - GOLANG_VERSION: 1.14.1 + - GOLANG_VERSION: 1.14.3 - GOMAXPROCS: 1 - GOPATH: /home/circleci/go - GOTESTSUM_JSONFILE: /tmp/test-reports/testjsonfile.json @@ -874,7 +874,7 @@ jobs: path: /tmp/test-reports test-devices: docker: - - image: golang:1.14.1 + - image: golang:1.14.3 working_directory: /go/src/github.com/hashicorp/nomad environment: - GIT_PAGER: cat @@ -998,7 +998,7 @@ jobs: path: pkg/darwin_amd64.zip environment: - GIT_PAGER: cat - - GOLANG_VERSION: 1.14 + - GOLANG_VERSION: 1.14.3 - GOMAXPROCS: 1 - GOPATH: /Users/distiller/go - GOTESTSUM_JSONFILE: /tmp/test-reports/testjsonfile.json @@ -1011,7 +1011,7 @@ jobs: working_directory: ~/go/src/github.com/hashicorp/nomad environment: - GIT_PAGER: cat - - GOLANG_VERSION: 1.14.1 + - GOLANG_VERSION: 1.14.3 - GOMAXPROCS: 1 - GOPATH: /home/circleci/go - GOTESTSUM_JSONFILE: /tmp/test-reports/testjsonfile.json @@ -1119,7 +1119,7 @@ jobs: path: /tmp/test-reports build-binaries: docker: - - image: golang:1.14.1 + - image: golang:1.14.3 working_directory: /go/src/github.com/hashicorp/nomad environment: - GIT_PAGER: cat @@ -1153,7 +1153,7 @@ jobs: path: pkg/linux_amd64.zip test-e2e: docker: - - image: golang:1.14.1 + - image: golang:1.14.3 working_directory: /go/src/github.com/hashicorp/nomad steps: - checkout @@ -1185,7 +1185,7 @@ jobs: working_directory: ~/go/src/github.com/hashicorp/nomad environment: - GIT_PAGER: cat - - GOLANG_VERSION: 1.14.1 + - GOLANG_VERSION: 1.14.3 - GOMAXPROCS: 1 - GOPATH: /home/circleci/go - GOTESTSUM_JSONFILE: /tmp/test-reports/testjsonfile.json diff --git a/.circleci/config/config.yml b/.circleci/config/config.yml index 3173eba09290..221660c67ddc 100644 --- a/.circleci/config/config.yml +++ b/.circleci/config/config.yml @@ -24,7 +24,7 @@ executors: go: working_directory: /go/src/github.com/hashicorp/nomad docker: - - image: golang:1.14.1 + - image: golang:1.14.3 environment: <<: *common_envs GOPATH: /go @@ -36,7 +36,7 @@ executors: environment: &machine_env <<: *common_envs GOPATH: /home/circleci/go - GOLANG_VERSION: 1.14.1 + GOLANG_VERSION: 1.14.3 # uses a more recent image with unattended upgrades disabled properly # but seems to break docker builds @@ -53,7 +53,7 @@ executors: environment: <<: *common_envs GOPATH: /Users/distiller/go - GOLANG_VERSION: 1.14 + GOLANG_VERSION: 1.14.3 go-windows: machine: @@ -65,6 +65,6 @@ executors: GOPATH: c:\gopath GOBIN: c:\gopath\bin GOTESTSUM_PATH: c:\tmp\test-reports - GOLANG_VERSION: 1.14.1 + GOLANG_VERSION: 1.14.3 GOTESTSUM_VERSION: 0.4.2 VAULT_VERSION: 1.4.1 diff --git a/README.md b/README.md index a771fa43f473..5461ee0dbe01 100644 --- a/README.md +++ b/README.md @@ -138,7 +138,7 @@ Who Uses Nomad Contributing to Nomad -------------------- -If you wish to contribute to Nomad, you will need [Go](https://www.golang.org) installed on your machine (version 1.14.1+ is *required*, and `gcc-go` is not supported). +If you wish to contribute to Nomad, you will need [Go](https://www.golang.org) installed on your machine (version 1.14.3+ is *required*, and `gcc-go` is not supported). See the [`contributing`](contributing/) directory for more developer documentation. diff --git a/scripts/release/mac-remote-build b/scripts/release/mac-remote-build index 0758382775df..b87f0dd06c66 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.14.1" + local go_version="1.14.3" 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 3ed80e87418a..a7284ba329f0 100755 --- a/scripts/update_golang_version.sh +++ b/scripts/update_golang_version.sh @@ -1,5 +1,12 @@ #!/bin/sh +if [ -z "$1" ]; then + echo "usage: $0 GO_VERSION" + echo "" + echo "For example: $0 1.14.3" + exit 1 +fi + golang_version="$1" current_version=$(grep -o -e 'golang:[.0-9]*' .circleci/config.yml | head -n1 | cut -d: -f2) diff --git a/scripts/vagrant-linux-priv-go.sh b/scripts/vagrant-linux-priv-go.sh index 780f37d51199..95fb547b4e57 100755 --- a/scripts/vagrant-linux-priv-go.sh +++ b/scripts/vagrant-linux-priv-go.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash function install_go() { - local go_version="1.14.1" + local go_version="1.14.3" local download= download="https://storage.googleapis.com/golang/go${go_version}.linux-amd64.tar.gz"