Skip to content

Commit

Permalink
Merge pull request #13963 from hashicorp/backport/build-update-golang…
Browse files Browse the repository at this point in the history
…/indirectly-discrete-raccoon

Backport of build: update to go1.18.5 into release/1.2.x
  • Loading branch information
shoenig authored Aug 2, 2022
2 parents c188255 + 274bc36 commit b4b75ce
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ executors:
go:
working_directory: /go/src/github.com/hashicorp/nomad
docker:
- image: docker.mirror.hashicorp.services/golang:1.18.3
- image: docker.mirror.hashicorp.services/golang:1.18.5
resource_class: medium
environment:
<<: *common_envs
Expand All @@ -469,7 +469,7 @@ executors:
resource_class: large
environment: &machine_env
<<: *common_envs
GOLANG_VERSION: 1.18.3
GOLANG_VERSION: 1.18.5

go-macos:
working_directory: ~/go/src/github.com/hashicorp/nomad
Expand All @@ -478,7 +478,7 @@ executors:
environment:
<<: *common_envs
GOPATH: /Users/distiller/go
GOLANG_VERSION: 1.18.3
GOLANG_VERSION: 1.18.5

go-windows:
machine:
Expand All @@ -490,7 +490,7 @@ executors:
GOPATH: c:\gopath
GOBIN: c:\gopath\bin
GOTESTSUM_PATH: c:\tmp\test-reports
GOLANG_VERSION: 1.18.3
GOLANG_VERSION: 1.18.5
GOTESTSUM_VERSION: 1.7.0
VAULT_VERSION: 1.4.1

Expand Down
2 changes: 1 addition & 1 deletion .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.18.3
1.18.5
2 changes: 1 addition & 1 deletion contributing/README.md
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.18.3+](https://golang.org/) *(Note: `gcc-go` is not supported)*
1. Install [Go 1.18.5+](https://golang.org/) *(Note: `gcc-go` is not supported)*
1. Clone this repo
```sh
$ git clone https://github.com/hashicorp/nomad.git
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.18.3"
local go_version="1.18.5"
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
Expand Up @@ -3,7 +3,7 @@
set -o errexit

function install_go() {
local go_version="1.18.3"
local go_version="1.18.5"
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

0 comments on commit b4b75ce

Please sign in to comment.