Skip to content

Commit

Permalink
Merge pull request #7970 from hashicorp/go1.14.3
Browse files Browse the repository at this point in the history
Go1.14.3
  • Loading branch information
Mahmood Ali committed Jun 1, 2020
1 parent 37be73e commit 94e81bb
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 21 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.1
- image: golang:1.14.3
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.1
GOLANG_VERSION: 1.14.3

# 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
GOLANG_VERSION: 1.14.3

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.1
GOLANG_VERSION: 1.14.3
GOTESTSUM_VERSION: 0.4.2
VAULT_VERSION: 1.4.1
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,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.1+ 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.3+ 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.1"
local go_version="1.14.3"
local download=
download="https://storage.googleapis.com/golang/go${go_version}.darwin-amd64.tar.gz"
Expand Down
7 changes: 7 additions & 0 deletions scripts/update_golang_version.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
#!/bin/sh

if [ -z "$1" ]; then
echo "usage: $0 GO_VERSION"
echo ""
echo "For example: $0 1.14.3"
exit 1
fi

golang_version="$1"

current_version=$(grep -o -e 'golang:[.0-9]*' .circleci/config.yml | head -n1 | cut -d: -f2)
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.1"
local go_version="1.14.3"
local download=

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

0 comments on commit 94e81bb

Please # to comment.