Skip to content

Commit

Permalink
Merge pull request #8467 from hashicorp/c-golang-1.14.6
Browse files Browse the repository at this point in the history
Use golang 1.14.6
  • Loading branch information
Mahmood Ali authored Jul 20, 2020
2 parents 6b3ff2e + 3969d17 commit e023f9c
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 22 deletions.
28 changes: 14 additions & 14 deletions .circleci/config.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions .circleci/config/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ executors:
go:
working_directory: /go/src/github.com/hashicorp/nomad
docker:
- image: golang:1.14.5
- image: golang:1.14.6
environment:
<<: *common_envs
GOPATH: /go
Expand All @@ -36,7 +36,7 @@ executors:
environment: &machine_env
<<: *common_envs
GOPATH: /home/circleci/go
GOLANG_VERSION: 1.14.5
GOLANG_VERSION: 1.14.6

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

go-windows:
machine:
Expand All @@ -65,6 +65,6 @@ executors:
GOPATH: c:\gopath
GOBIN: c:\gopath\bin
GOTESTSUM_PATH: c:\tmp\test-reports
GOLANG_VERSION: 1.14.5
GOLANG_VERSION: 1.14.6
GOTESTSUM_VERSION: 0.4.2
VAULT_VERSION: 1.4.1
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

SECURITY:

* build: Updated to Go 1.14.5. Go 1.14.4 contained 2 CVEs which are low severity for Nomad. [[GH-8441](https://github.com/hashicorp/nomad/issues/8441)]
* build: Updated to Go 1.14.6. Go 1.14.4 contained 2 CVEs which are low severity for Nomad. [[GH-8467](https://github.com/hashicorp/nomad/issues/8467)]

BUG FIXES:

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,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.5+ 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.6+ is *required*, and `gcc-go` is not supported).

See the [`contributing`](contributing/) directory for more developer documentation.

Expand Down
2 changes: 1 addition & 1 deletion scripts/release/mac-remote-build
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.14.5"
local go_version="1.14.6"
local download=
download="https://storage.googleapis.com/golang/go${go_version}.darwin-amd64.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion scripts/vagrant-linux-priv-go.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash

function install_go() {
local go_version="1.14.5"
local go_version="1.14.6"
local download=

download="https://storage.googleapis.com/golang/go${go_version}.linux-amd64.tar.gz"
Expand Down

0 comments on commit e023f9c

Please sign in to comment.