From 65175d15ccd316669d897666587250d74bf18929 Mon Sep 17 00:00:00 2001 From: Michael Schurter Date: Thu, 12 Nov 2020 14:19:26 -0800 Subject: [PATCH] build: upgrade from Go 1.15.4 to 1.15.5 Despite being a security release for Go, we do not believe Nomad is impacted. --- .circleci/config.yml | 28 ++++++++++++++-------------- .circleci/config/config.yml | 8 ++++---- README.md | 2 +- scripts/release/mac-remote-build | 2 +- scripts/vagrant-linux-priv-go.sh | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7204dbab0..64950d91d 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.15.4 + - GOLANG_VERSION: 1.15.5 - GOMAXPROCS: 1 - GOPATH: /home/circleci/go - GOTESTSUM_JSONFILE: /tmp/test-reports/testjsonfile.json @@ -128,7 +128,7 @@ jobs: working_directory: ~/go/src/github.com/hashicorp/nomad environment: - GIT_PAGER: cat - - GOLANG_VERSION: 1.15.4 + - GOLANG_VERSION: 1.15.5 - GOMAXPROCS: 1 - GOPATH: /home/circleci/go - GOTESTSUM_JSONFILE: /tmp/test-reports/testjsonfile.json @@ -246,7 +246,7 @@ jobs: working_directory: ~/go/src/github.com/hashicorp/nomad environment: - GIT_PAGER: cat - - GOLANG_VERSION: 1.15.4 + - GOLANG_VERSION: 1.15.5 - GOMAXPROCS: 1 - GOPATH: /home/circleci/go - GOTESTSUM_JSONFILE: /tmp/test-reports/testjsonfile.json @@ -364,7 +364,7 @@ jobs: working_directory: ~/go/src/github.com/hashicorp/nomad environment: - GIT_PAGER: cat - - GOLANG_VERSION: 1.15.4 + - GOLANG_VERSION: 1.15.5 - GOMAXPROCS: 1 - GOPATH: /home/circleci/go - GOTESTSUM_JSONFILE: /tmp/test-reports/testjsonfile.json @@ -574,7 +574,7 @@ jobs: path: c:\tmp\test-reports environment: - GOBIN: c:\gopath\bin - - GOLANG_VERSION: 1.15.4 + - GOLANG_VERSION: 1.15.5 - GOPATH: c:\gopath - GOTESTSUM_PATH: c:\tmp\test-reports - GOTESTSUM_VERSION: 0.4.2 @@ -587,7 +587,7 @@ jobs: working_directory: ~/go/src/github.com/hashicorp/nomad environment: - GIT_PAGER: cat - - GOLANG_VERSION: 1.15.4 + - GOLANG_VERSION: 1.15.5 - GOMAXPROCS: 1 - GOPATH: /home/circleci/go - GOTESTSUM_JSONFILE: /tmp/test-reports/testjsonfile.json @@ -732,7 +732,7 @@ jobs: path: /tmp/test-reports lint-go: docker: - - image: docker.mirror.hashicorp.services/golang:1.15.4 + - image: docker.mirror.hashicorp.services/golang:1.15.5 working_directory: /go/src/github.com/hashicorp/nomad steps: - checkout @@ -798,7 +798,7 @@ jobs: working_directory: ~/go/src/github.com/hashicorp/nomad environment: - GIT_PAGER: cat - - GOLANG_VERSION: 1.15.4 + - GOLANG_VERSION: 1.15.5 - GOMAXPROCS: 1 - GOPATH: /home/circleci/go - GOTESTSUM_JSONFILE: /tmp/test-reports/testjsonfile.json @@ -912,7 +912,7 @@ jobs: path: /tmp/test-reports test-devices: docker: - - image: docker.mirror.hashicorp.services/golang:1.15.4 + - image: docker.mirror.hashicorp.services/golang:1.15.5 working_directory: /go/src/github.com/hashicorp/nomad environment: - GIT_PAGER: cat @@ -1041,7 +1041,7 @@ jobs: path: pkg/darwin_amd64.zip environment: - GIT_PAGER: cat - - GOLANG_VERSION: 1.15.4 + - GOLANG_VERSION: 1.15.5 - GOMAXPROCS: 1 - GOPATH: /Users/distiller/go - GOTESTSUM_JSONFILE: /tmp/test-reports/testjsonfile.json @@ -1070,7 +1070,7 @@ jobs: working_directory: ~/go/src/github.com/hashicorp/nomad environment: - GIT_PAGER: cat - - GOLANG_VERSION: 1.15.4 + - GOLANG_VERSION: 1.15.5 - GOMAXPROCS: 1 - GOPATH: /home/circleci/go - GOTESTSUM_JSONFILE: /tmp/test-reports/testjsonfile.json @@ -1184,7 +1184,7 @@ jobs: path: /tmp/test-reports build-binaries: docker: - - image: docker.mirror.hashicorp.services/golang:1.15.4 + - image: docker.mirror.hashicorp.services/golang:1.15.5 working_directory: /go/src/github.com/hashicorp/nomad environment: - GIT_PAGER: cat @@ -1218,7 +1218,7 @@ jobs: path: pkg/linux_amd64.zip test-e2e: docker: - - image: docker.mirror.hashicorp.services/golang:1.15.4 + - image: docker.mirror.hashicorp.services/golang:1.15.5 working_directory: /go/src/github.com/hashicorp/nomad steps: - checkout @@ -1252,7 +1252,7 @@ jobs: working_directory: ~/go/src/github.com/hashicorp/nomad environment: - GIT_PAGER: cat - - GOLANG_VERSION: 1.15.4 + - GOLANG_VERSION: 1.15.5 - 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 405cf83b3..ba9da2443 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: docker.mirror.hashicorp.services/golang:1.15.4 + - image: docker.mirror.hashicorp.services/golang:1.15.5 environment: <<: *common_envs GOPATH: /go @@ -36,7 +36,7 @@ executors: environment: &machine_env <<: *common_envs GOPATH: /home/circleci/go - GOLANG_VERSION: 1.15.4 + GOLANG_VERSION: 1.15.5 # 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.15.4 + GOLANG_VERSION: 1.15.5 go-windows: machine: @@ -65,6 +65,6 @@ executors: GOPATH: c:\gopath GOBIN: c:\gopath\bin GOTESTSUM_PATH: c:\tmp\test-reports - GOLANG_VERSION: 1.15.4 + GOLANG_VERSION: 1.15.5 GOTESTSUM_VERSION: 0.4.2 VAULT_VERSION: 1.4.1 diff --git a/README.md b/README.md index 08063232e..69aadeb3a 100644 --- a/README.md +++ b/README.md @@ -121,7 +121,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.15.4+ 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.15.5+ 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 69ea426bb..f66e5b61f 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.4" + local go_version="1.15.5" 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 1b781b84d..7bfc7924f 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.15.4" + local go_version="1.15.5" local download= download="https://storage.googleapis.com/golang/go${go_version}.linux-amd64.tar.gz"