Skip to content

Commit

Permalink
build: update golang version to 1.18.2
Browse files Browse the repository at this point in the history
This PR update to Go 1.18.2. Also update the versions of hclfmt
and go-hclogfmt which includes newer dependencies necessary for dealing
with go1.18.
  • Loading branch information
shoenig committed May 23, 2022
1 parent fc01617 commit 3ec77d5
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ executors:
go:
working_directory: /go/src/github.com/hashicorp/nomad
docker:
- image: docker.mirror.hashicorp.services/golang:1.17.9
- image: docker.mirror.hashicorp.services/golang:1.18.2
resource_class: medium
environment:
<<: *common_envs
Expand All @@ -470,7 +470,7 @@ executors:
resource_class: large
environment: &machine_env
<<: *common_envs
GOLANG_VERSION: 1.17.9
GOLANG_VERSION: 1.18.2

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

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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-core.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ on:
- 'website/**'
env:
VERBOSE: 1
GO_VERSION: 1.17.9
GO_VERSION: 1.18.2
GOBIN: /usr/local/bin
GOTESTARCH: amd64
CONSUL_VERSION: 1.11.3
Expand Down
2 changes: 1 addition & 1 deletion .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.17.9
1.18.2
4 changes: 2 additions & 2 deletions GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ deps: ## Install build and development dependencies
go install github.com/elazarl/go-bindata-assetfs/go-bindata-assetfs@234c15e7648ff35458026de92b34c637bae5e6f7
go install github.com/a8m/tree/cmd/tree@fce18e2a750ea4e7f53ee706b1c3d9cbb22de79c
go install gotest.tools/[email protected]
go install github.com/hashicorp/hcl/v2/cmd/hclfmt@v2.5.1
go install github.com/hashicorp/hcl/v2/cmd/hclfmt@v2.12.0
go install github.com/golang/protobuf/[email protected]
go install github.com/hashicorp/go-msgpack/codec/[email protected]
go install github.com/bufbuild/buf/cmd/[email protected]
Expand All @@ -145,7 +145,7 @@ lint-deps: ## Install linter dependencies
@echo "==> Updating linter dependencies..."
go install github.com/golangci/golangci-lint/cmd/[email protected]
go install github.com/client9/misspell/cmd/[email protected]
go install github.com/hashicorp/go-hclog/[email protected].3
go install github.com/hashicorp/go-hclog/[email protected].4

.PHONY: git-hooks
git-dir = $(shell git rev-parse --git-dir)
Expand Down
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.17.9+](https://golang.org/) *(Note: `gcc-go` is not supported)*
1. Install [Go 1.18.2+](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.17.9"
local go_version="1.18.2"
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.17.9"
local go_version="1.18.2"
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 3ec77d5

Please sign in to comment.