Unverified Commit 3f738486 authored by Michael Schurter's avatar Michael Schurter Committed by GitHub
Browse files

Merge pull request #9686 from hashicorp/golang1.15.6

build: upgrade from Go 1.15.5 -> 1.15.6
parents 8a360bf9 240697b6
Showing with 16 additions and 11 deletions
+16 -11
...@@ -430,7 +430,7 @@ executors: ...@@ -430,7 +430,7 @@ executors:
go: go:
working_directory: /go/src/github.com/hashicorp/nomad working_directory: /go/src/github.com/hashicorp/nomad
docker: docker:
- image: docker.mirror.hashicorp.services/golang:1.15.5 - image: docker.mirror.hashicorp.services/golang:1.15.6
environment: environment:
<<: *common_envs <<: *common_envs
GOPATH: /go GOPATH: /go
...@@ -442,7 +442,7 @@ executors: ...@@ -442,7 +442,7 @@ executors:
environment: &machine_env environment: &machine_env
<<: *common_envs <<: *common_envs
GOPATH: /home/circleci/go GOPATH: /home/circleci/go
GOLANG_VERSION: 1.15.5 GOLANG_VERSION: 1.15.6
# uses a more recent image with unattended upgrades disabled properly # uses a more recent image with unattended upgrades disabled properly
# but seems to break docker builds # but seems to break docker builds
...@@ -459,7 +459,7 @@ executors: ...@@ -459,7 +459,7 @@ executors:
environment: environment:
<<: *common_envs <<: *common_envs
GOPATH: /Users/distiller/go GOPATH: /Users/distiller/go
GOLANG_VERSION: 1.15.5 GOLANG_VERSION: 1.15.6
go-windows: go-windows:
machine: machine:
...@@ -471,7 +471,7 @@ executors: ...@@ -471,7 +471,7 @@ executors:
GOPATH: c:\gopath GOPATH: c:\gopath
GOBIN: c:\gopath\bin GOBIN: c:\gopath\bin
GOTESTSUM_PATH: c:\tmp\test-reports GOTESTSUM_PATH: c:\tmp\test-reports
GOLANG_VERSION: 1.15.5 GOLANG_VERSION: 1.15.6
GOTESTSUM_VERSION: 0.4.2 GOTESTSUM_VERSION: 0.4.2
VAULT_VERSION: 1.4.1 VAULT_VERSION: 1.4.1
......
## 1.0.2 (Unreleased) ## 1.0.2 (Unreleased)
IMPROVEMENTS: IMPROVEMENTS:
* build: Updated to Go 1.15.6. [[GH-9686](https://github.com/hashicorp/nomad/issues/9686)]
* consul/connect: interpolate the connect, service meta, and service canary meta blocks with the task environment [[GH-9586](https://github.com/hashicorp/nomad/pull/9586)] * consul/connect: interpolate the connect, service meta, and service canary meta blocks with the task environment [[GH-9586](https://github.com/hashicorp/nomad/pull/9586)]
BUG FIXES: BUG FIXES:
......
...@@ -30,7 +30,7 @@ A development environment is supplied via Vagrant to make getting started easier ...@@ -30,7 +30,7 @@ A development environment is supplied via Vagrant to make getting started easier
Developing without Vagrant Developing without Vagrant
--- ---
1. Install [Go 1.15.5+](https://golang.org/) *(Note: `gcc-go` is not supported)* 1. Install [Go 1.15.6+](https://golang.org/) *(Note: `gcc-go` is not supported)*
1. Clone this repo 1. Clone this repo
```sh ```sh
$ git clone https://github.com/hashicorp/nomad.git $ git clone https://github.com/hashicorp/nomad.git
......
...@@ -12,6 +12,7 @@ version. ...@@ -12,6 +12,7 @@ version.
| Nomad Version | Go Version | | Nomad Version | Go Version |
|:-------------:|:----------:| |:-------------:|:----------:|
| 1.0.2 | 1.15.6 |
| 1.0 | 1.15.5 | | 1.0 | 1.15.5 |
| 0.12.2 | 1.14.7 | | 0.12.2 | 1.14.7 |
| 0.12.1 | 1.14.6 | | 0.12.1 | 1.14.6 |
......
...@@ -56,7 +56,7 @@ REPO_PATH="${TMP_WORKSPACE}/gopath/src/github.com/hashicorp/nomad" ...@@ -56,7 +56,7 @@ REPO_PATH="${TMP_WORKSPACE}/gopath/src/github.com/hashicorp/nomad"
mkdir -p "${TMP_WORKSPACE}/tmp" mkdir -p "${TMP_WORKSPACE}/tmp"
install_go() { install_go() {
local go_version="1.15.5" local go_version="1.15.6"
local download= local download=
download="https://storage.googleapis.com/golang/go${go_version}.darwin-amd64.tar.gz" download="https://storage.googleapis.com/golang/go${go_version}.darwin-amd64.tar.gz"
......
...@@ -9,16 +9,19 @@ fi ...@@ -9,16 +9,19 @@ fi
golang_version="$1" golang_version="$1"
current_version=$(grep -o -e 'golang:[.0-9]*' .circleci/config.yml | head -n1 | cut -d: -f2) current_version=$(grep -o -E -e '/golang:[.0-9]+' .circleci/config.yml | head -n1 | cut -d: -f2)
if [ -z "${current_version}" ]; then
echo "unable to find current go version"
exit 1
fi
echo "--> Replacing Go ${current_version} with Go ${golang_version} ..." echo "--> Replacing Go ${current_version} with Go ${golang_version} ..."
# To support both GNU and BSD sed, the regex is looser than it needs to be. # To support both GNU and BSD sed, the regex is looser than it needs to be.
# Specifically, we use "* instead of "?, which relies on GNU extension without much loss of # Specifically, we use "* instead of "?, which relies on GNU extension without much loss of
# correctness in practice. # correctness in practice.
sed -i'' -e "s|golang:[.0-9]*|golang:${golang_version}|g" \ sed -i'' -e "s|/golang:[.0-9]*|/golang:${golang_version}|g" .circleci/config.yml
.circleci/config/config.yml .circleci/config.yml
sed -i'' -e "s|GOLANG_VERSION:[ \"]*[.0-9]*\"*|GOLANG_VERSION: ${golang_version}|g" \ sed -i'' -e "s|GOLANG_VERSION:[ \"]*[.0-9]*\"*|GOLANG_VERSION: ${golang_version}|g" \
.circleci/config/config.yml .circleci/config.yml .circleci/config.yml
sed -i'' -e "s|\\(golang.org.*version\\) [.0-9]*|\\1 ${golang_version}|g" \ sed -i'' -e "s|\\(golang.org.*version\\) [.0-9]*|\\1 ${golang_version}|g" \
README.md README.md
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
set -o errexit set -o errexit
function install_go() { function install_go() {
local go_version="1.15.5" local go_version="1.15.6"
local download="https://storage.googleapis.com/golang/go${go_version}.linux-amd64.tar.gz" local download="https://storage.googleapis.com/golang/go${go_version}.linux-amd64.tar.gz"
if go version 2>&1 | grep -q "${go_version}"; then if go version 2>&1 | grep -q "${go_version}"; then
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment