From 916c6bdda4f5f76ce3b0687fe1cd6aca891f3887 Mon Sep 17 00:00:00 2001 From: Mahmood Ali Date: Thu, 26 Sep 2019 10:46:07 -0400 Subject: [PATCH] Use golang to 1.12.10 To get fix for https://github.com/golang/go/issues/34540 . --- .circleci/config.yml | 4 ++-- README.md | 2 +- appveyor.yml | 4 ++-- scripts/release/mac-remote-build | 2 +- scripts/vagrant-linux-priv-go.sh | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fa9b7947e..dea34a5d1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -80,7 +80,7 @@ executors: go: working_directory: /go/src/github.com/hashicorp/nomad docker: - - image: circleci/golang:1.12.9 + - image: circleci/golang:1.12.10 go-machine: working_directory: ~/go/src/github.com/hashicorp/nomad machine: @@ -299,7 +299,7 @@ commands: parameters: version: type: string - default: "1.12.9" + default: "1.12.10" steps: - run: name: install golang << parameters.version >> diff --git a/README.md b/README.md index 7fff1c34a..747019378 100644 --- a/README.md +++ b/README.md @@ -140,7 +140,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.12.9+ is *required*). +If you wish to contribute to Nomad, you will need [Go](https://www.golang.org) installed on your machine (version 1.12.10+ is *required*). See the [`contributing`](contributing/) directory for more developer documentation. diff --git a/appveyor.yml b/appveyor.yml index 25deb5f40..e005f880e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -23,10 +23,10 @@ install: cd %APPVEYOR_BUILD_FOLDER% rmdir /Q/S C:\go - # install go 1.12.9 to match version used for cutting a release + # install go 1.12.10 to match version used for cutting a release - cmd: | mkdir c:\go - appveyor DownloadFile "https://dl.google.com/go/go1.12.9.windows-amd64.zip" -FileName "%TEMP%\\go.zip" + appveyor DownloadFile "https://dl.google.com/go/go1.12.10.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 837ac0ae4..bdaddc72a 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.12.9" + local go_version="1.12.10" 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 5a5c937d2..f9b03a175 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.12.9 + local go_version=1.12.10 local download= download="https://storage.googleapis.com/golang/go${go_version}.linux-amd64.tar.gz"