luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Merge pull request #8467 from hashicorp/c-golang-1.14.6 

Use golang 1.14.6
This commit is contained in:
Mahmood Ali 2020-07-20 12:37:12 -04:00 committed by GitHub
parent a5064a55f9 4f2e09807f
commit 226f25fdba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
.circleci/config.yml generated
View File

@ -10,7 +10,7 @@ jobs:
working_directory: ~/go/src/github.com/hashicorp/nomad
environment:
- GIT_PAGER: cat
- GOLANG_VERSION: 1.14.5
- GOLANG_VERSION: 1.14.6
- GOMAXPROCS: 1
- GOPATH: /home/circleci/go
- GOTESTSUM_JSONFILE: /tmp/test-reports/testjsonfile.json
@ -128,7 +128,7 @@ jobs:
working_directory: ~/go/src/github.com/hashicorp/nomad
environment:
- GIT_PAGER: cat
- GOLANG_VERSION: 1.14.5
- GOLANG_VERSION: 1.14.6
- GOMAXPROCS: 1
- GOPATH: /home/circleci/go
- GOTESTSUM_JSONFILE: /tmp/test-reports/testjsonfile.json
@ -246,7 +246,7 @@ jobs:
working_directory: ~/go/src/github.com/hashicorp/nomad
environment:
- GIT_PAGER: cat
- GOLANG_VERSION: 1.14.5
- GOLANG_VERSION: 1.14.6
- GOMAXPROCS: 1
- GOPATH: /home/circleci/go
- GOTESTSUM_JSONFILE: /tmp/test-reports/testjsonfile.json
@ -364,7 +364,7 @@ jobs:
working_directory: ~/go/src/github.com/hashicorp/nomad
environment:
- GIT_PAGER: cat
- GOLANG_VERSION: 1.14.5
- GOLANG_VERSION: 1.14.6
- GOMAXPROCS: 1
- GOPATH: /home/circleci/go
- GOTESTSUM_JSONFILE: /tmp/test-reports/testjsonfile.json
@ -574,7 +574,7 @@ jobs:
path: c:\tmp\test-reports
environment:
- GOBIN: c:\gopath\bin
- GOLANG_VERSION: 1.14.5
- GOLANG_VERSION: 1.14.6
- GOPATH: c:\gopath
- GOTESTSUM_PATH: c:\tmp\test-reports
- GOTESTSUM_VERSION: 0.4.2
@ -587,7 +587,7 @@ jobs:
working_directory: ~/go/src/github.com/hashicorp/nomad
environment:
- GIT_PAGER: cat
- GOLANG_VERSION: 1.14.5
- GOLANG_VERSION: 1.14.6
- GOMAXPROCS: 1
- GOPATH: /home/circleci/go
- GOTESTSUM_JSONFILE: /tmp/test-reports/testjsonfile.json
@ -732,7 +732,7 @@ jobs:
path: /tmp/test-reports
lint-go:
docker:
- image: golang:1.14.5
- image: golang:1.14.6
working_directory: /go/src/github.com/hashicorp/nomad
steps:
- checkout
@ -798,7 +798,7 @@ jobs:
working_directory: ~/go/src/github.com/hashicorp/nomad
environment:
- GIT_PAGER: cat
- GOLANG_VERSION: 1.14.5
- GOLANG_VERSION: 1.14.6
- GOMAXPROCS: 1
- GOPATH: /home/circleci/go
- GOTESTSUM_JSONFILE: /tmp/test-reports/testjsonfile.json
@ -912,7 +912,7 @@ jobs:
path: /tmp/test-reports
test-devices:
docker:
- image: golang:1.14.5
- image: golang:1.14.6
working_directory: /go/src/github.com/hashicorp/nomad
environment:
- GIT_PAGER: cat
@ -1041,7 +1041,7 @@ jobs:
path: pkg/darwin_amd64.zip
environment:
- GIT_PAGER: cat
- GOLANG_VERSION: 1.14.5
- GOLANG_VERSION: 1.14.6
- GOMAXPROCS: 1
- GOPATH: /Users/distiller/go
- GOTESTSUM_JSONFILE: /tmp/test-reports/testjsonfile.json
@ -1070,7 +1070,7 @@ jobs:
working_directory: ~/go/src/github.com/hashicorp/nomad
environment:
- GIT_PAGER: cat
- GOLANG_VERSION: 1.14.5
- GOLANG_VERSION: 1.14.6
- GOMAXPROCS: 1
- GOPATH: /home/circleci/go
- GOTESTSUM_JSONFILE: /tmp/test-reports/testjsonfile.json
@ -1184,7 +1184,7 @@ jobs:
path: /tmp/test-reports
build-binaries:
docker:
- image: golang:1.14.5
- image: golang:1.14.6
working_directory: /go/src/github.com/hashicorp/nomad
environment:
- GIT_PAGER: cat
@ -1218,7 +1218,7 @@ jobs:
path: pkg/linux_amd64.zip
test-e2e:
docker:
- image: golang:1.14.5
- image: golang:1.14.6
working_directory: /go/src/github.com/hashicorp/nomad
steps:
- checkout
@ -1250,7 +1250,7 @@ jobs:
working_directory: ~/go/src/github.com/hashicorp/nomad
environment:
- GIT_PAGER: cat
- GOLANG_VERSION: 1.14.5
- GOLANG_VERSION: 1.14.6
- GOMAXPROCS: 1
- GOPATH: /home/circleci/go
- GOTESTSUM_JSONFILE: /tmp/test-reports/testjsonfile.json

8
.circleci/config/config.yml
View File

@ -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
@ -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
@ -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:
@ -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
CHANGELOG.md
View File

@ -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:

2
README.md
View File

@ -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.

2
scripts/release/mac-remote-build
View File

@ -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"

2
scripts/vagrant-linux-priv-go.sh
View File

@ -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"