Skip to content

Commit

Permalink
Merge pull request #7431 from hashicorp/ci-golang-1.14.1
Browse files Browse the repository at this point in the history
use golang 14.1
  • Loading branch information
Mahmood Ali committed Mar 23, 2020
2 parents 7950b5e + dda776e commit f0505a2
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 18 deletions.
24 changes: 12 additions & 12 deletions .circleci/config.yml

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

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

# uses a more recent image with unattended upgrades disabled properly
# but seems to break docker builds
Expand Down
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+ 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.1+ 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 appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ install:
# install the go version used for cutting a release
- cmd: |
mkdir c:\go
appveyor DownloadFile "https://dl.google.com/go/go1.14.windows-amd64.zip" -FileName "%TEMP%\\go.zip"
appveyor DownloadFile "https://dl.google.com/go/go1.14.1.windows-amd64.zip" -FileName "%TEMP%\\go.zip"
- ps: Expand-Archive $Env:TEMP\go.zip -DestinationPath C:\

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"
local go_version="1.14.1"
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"
local go_version="1.14.1"
local download=

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

0 comments on commit f0505a2

Please sign in to comment.