Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: upgrade from Go 1.15.5 -> 1.15.6 #9686

Merged
merged 1 commit into from
Jan 4, 2021
Merged

build: upgrade from Go 1.15.5 -> 1.15.6 #9686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ executors:
go:
working_directory: /go/src/github.com/hashicorp/nomad
docker:
- image: docker.mirror.hashicorp.services/golang:1.15.5
- image: docker.mirror.hashicorp.services/golang:1.15.6
environment:
<<: *common_envs
GOPATH: /go
Expand All @@ -442,7 +442,7 @@ executors:
environment: &machine_env
<<: *common_envs
GOPATH: /home/circleci/go
GOLANG_VERSION: 1.15.5
GOLANG_VERSION: 1.15.6

# uses a more recent image with unattended upgrades disabled properly
# but seems to break docker builds
Expand All @@ -459,7 +459,7 @@ executors:
environment:
<<: *common_envs
GOPATH: /Users/distiller/go
GOLANG_VERSION: 1.15.5
GOLANG_VERSION: 1.15.6

go-windows:
machine:
Expand All @@ -471,7 +471,7 @@ executors:
GOPATH: c:\gopath
GOBIN: c:\gopath\bin
GOTESTSUM_PATH: c:\tmp\test-reports
GOLANG_VERSION: 1.15.5
GOLANG_VERSION: 1.15.6
GOTESTSUM_VERSION: 0.4.2
VAULT_VERSION: 1.4.1

Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
## 1.0.2 (Unreleased)

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)]

BUG FIXES:
Expand Down
2 changes: 1 addition & 1 deletion contributing/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ A development environment is supplied via Vagrant to make getting started easier

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
```sh
$ git clone https://github.com/hashicorp/nomad.git
Expand Down
1 change: 1 addition & 0 deletions contributing/golang.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ version.

| Nomad Version | Go Version |
|:-------------:|:----------:|
| 1.0.2 | 1.15.6 |
| 1.0 | 1.15.5 |
| 0.12.2 | 1.14.7 |
| 0.12.1 | 1.14.6 |
Expand Down
2 changes: 1 addition & 1 deletion scripts/release/mac-remote-build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.5"
local go_version="1.15.6"
local download=

download="https://storage.googleapis.com/golang/go${go_version}.darwin-amd64.tar.gz"
Expand Down
11 changes: 7 additions & 4 deletions scripts/update_golang_version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,19 @@ fi

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)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Old regex matched the install-golang: lines in config.yml.

I think only the / prefix or the -E and + are required, not both. Let me know if I should simpify it.

if [ -z "${current_version}" ]; then
echo "unable to find current go version"
exit 1
fi
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.
# Specifically, we use "* instead of "?, which relies on GNU extension without much loss of
# correctness in practice.
sed -i'' -e "s|golang:[.0-9]*|golang:${golang_version}|g" \
.circleci/config/config.yml .circleci/config.yml
sed -i'' -e "s|/golang:[.0-9]*|/golang:${golang_version}|g" .circleci/config.yml
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" \
README.md
Expand Down
2 changes: 1 addition & 1 deletion scripts/vagrant-linux-priv-go.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -o errexit

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"

if go version 2>&1 | grep -q "${go_version}"; then
Expand Down