From dda776e44aa3bca8cf44953b417168624a426e02 Mon Sep 17 00:00:00 2001 From: Mahmood Ali Date: Mon, 23 Mar 2020 13:02:14 -0400 Subject: [PATCH] use golang 14.1 --- .circleci/config.yml | 24 ++++++++++++------------ .circleci/config/config.yml | 4 ++-- README.md | 2 +- appveyor.yml | 2 +- scripts/release/mac-remote-build | 2 +- scripts/vagrant-linux-priv-go.sh | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index dcbac0e49297..c3fcfcebd5ac 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 + - GOLANG_VERSION: 1.14.1 - GOMAXPROCS: 1 - GOPATH: /home/circleci/go - GOTESTSUM_JUNITFILE: /tmp/test-reports/results.xml @@ -86,7 +86,7 @@ jobs: working_directory: ~/go/src/github.com/hashicorp/nomad environment: - GIT_PAGER: cat - - GOLANG_VERSION: 1.14 + - GOLANG_VERSION: 1.14.1 - GOMAXPROCS: 1 - GOPATH: /home/circleci/go - GOTESTSUM_JUNITFILE: /tmp/test-reports/results.xml @@ -162,7 +162,7 @@ jobs: working_directory: ~/go/src/github.com/hashicorp/nomad environment: - GIT_PAGER: cat - - GOLANG_VERSION: 1.14 + - GOLANG_VERSION: 1.14.1 - GOMAXPROCS: 1 - GOPATH: /home/circleci/go - GOTESTSUM_JUNITFILE: /tmp/test-reports/results.xml @@ -238,7 +238,7 @@ jobs: working_directory: ~/go/src/github.com/hashicorp/nomad environment: - GIT_PAGER: cat - - GOLANG_VERSION: 1.14 + - GOLANG_VERSION: 1.14.1 - GOMAXPROCS: 1 - GOPATH: /home/circleci/go - GOTESTSUM_JUNITFILE: /tmp/test-reports/results.xml @@ -314,7 +314,7 @@ jobs: working_directory: ~/go/src/github.com/hashicorp/nomad environment: - GIT_PAGER: cat - - GOLANG_VERSION: 1.14 + - GOLANG_VERSION: 1.14.1 - GOMAXPROCS: 1 - GOPATH: /home/circleci/go - GOTESTSUM_JUNITFILE: /tmp/test-reports/results.xml @@ -413,7 +413,7 @@ jobs: name: Ember tests lint-go: docker: - - image: golang:1.14 + - image: golang:1.14.1 working_directory: /go/src/github.com/hashicorp/nomad steps: - checkout @@ -476,7 +476,7 @@ jobs: working_directory: ~/go/src/github.com/hashicorp/nomad environment: - GIT_PAGER: cat - - GOLANG_VERSION: 1.14 + - GOLANG_VERSION: 1.14.1 - GOMAXPROCS: 1 - GOPATH: /home/circleci/go - GOTESTSUM_JUNITFILE: /tmp/test-reports/results.xml @@ -548,7 +548,7 @@ jobs: path: /tmp/test-reports test-devices: docker: - - image: golang:1.14 + - image: golang:1.14.1 working_directory: /go/src/github.com/hashicorp/nomad environment: - GIT_PAGER: cat @@ -611,7 +611,7 @@ jobs: working_directory: ~/go/src/github.com/hashicorp/nomad environment: - GIT_PAGER: cat - - GOLANG_VERSION: 1.14 + - GOLANG_VERSION: 1.14.1 - GOMAXPROCS: 1 - GOPATH: /home/circleci/go - GOTESTSUM_JUNITFILE: /tmp/test-reports/results.xml @@ -683,7 +683,7 @@ jobs: path: /tmp/test-reports build-binaries: docker: - - image: golang:1.14 + - image: golang:1.14.1 working_directory: /go/src/github.com/hashicorp/nomad environment: - GIT_PAGER: cat @@ -716,7 +716,7 @@ jobs: path: pkg/linux_amd64.zip test-e2e: docker: - - image: golang:1.14 + - image: golang:1.14.1 working_directory: /go/src/github.com/hashicorp/nomad steps: - checkout @@ -747,7 +747,7 @@ jobs: working_directory: ~/go/src/github.com/hashicorp/nomad environment: - GIT_PAGER: cat - - GOLANG_VERSION: 1.14 + - GOLANG_VERSION: 1.14.1 - GOMAXPROCS: 1 - GOPATH: /home/circleci/go - GOTESTSUM_JUNITFILE: /tmp/test-reports/results.xml diff --git a/.circleci/config/config.yml b/.circleci/config/config.yml index 8663094c796c..214bc2ad6736 100644 --- a/.circleci/config/config.yml +++ b/.circleci/config/config.yml @@ -21,7 +21,7 @@ executors: go: working_directory: /go/src/github.com/hashicorp/nomad docker: - - image: golang:1.14 + - image: golang:1.14.1 environment: <<: *common_envs GOPATH: /go @@ -33,7 +33,7 @@ executors: environment: &machine_env <<: *common_envs GOPATH: /home/circleci/go - GOLANG_VERSION: 1.14 + GOLANG_VERSION: 1.14.1 # uses a more recent image with unattended upgrades disabled properly # but seems to break docker builds diff --git a/README.md b/README.md index f9e33610006d..a771fa43f473 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+ 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.1+ is *required*, and `gcc-go` is not supported). See the [`contributing`](contributing/) directory for more developer documentation. diff --git a/appveyor.yml b/appveyor.yml index 83942dfd48db..d0b7ca1711a4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -26,7 +26,7 @@ install: # install the go version used for cutting a release - cmd: | mkdir c:\go - appveyor DownloadFile "https://dl.google.com/go/go1.14.windows-amd64.zip" -FileName "%TEMP%\\go.zip" + appveyor DownloadFile "https://dl.google.com/go/go1.14.1.windows-amd64.zip" -FileName "%TEMP%\\go.zip" - ps: Expand-Archive $Env:TEMP\go.zip -DestinationPath C:\ diff --git a/scripts/release/mac-remote-build b/scripts/release/mac-remote-build index 1988c42b81d3..4a08c20d9a9e 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" + local go_version="1.14.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 1f82e8fa1c24..ed361ee8704e 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" + local go_version="1.14.1" local download= download="https://storage.googleapis.com/golang/go${go_version}.linux-amd64.tar.gz"