Skip to content

Commit

Permalink
Merge pull request #13036 from hashicorp/f-update-golang-1.18.2
Browse files Browse the repository at this point in the history
build: update golang version to 1.18.2
  • Loading branch information
shoenig authored May 25, 2022
2 parents 3f92745 + f42ded0 commit 49ae238
Show file tree
Hide file tree
Showing 12 changed files with 26 additions and 48 deletions.
3 changes: 3 additions & 0 deletions .changelog/13036.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:improvement
build: update Go to version go1.18.2
```
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
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,13 @@ ui/dist/
website/.bundle
website/vendor

# Go work files
go.work

# init outputs
example.nomad
spec.hcl
volume.hcl

nomad_linux_amd64
nomad_darwin_amd64
TODO.md
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@d0c4fa8b0bbc2e4eeccd1ed2a32c2089ed8c5cf1
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
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hashicorp/nomad

go 1.17
go 1.18

// Pinned dependencies are noted in github.com/hashicorp/nomad/issues/11826
replace (
Expand Down Expand Up @@ -72,7 +72,7 @@ require (
github.com/hashicorp/go-version v1.4.0
github.com/hashicorp/golang-lru v0.5.4
github.com/hashicorp/hcl v1.0.1-vault-3
github.com/hashicorp/hcl/v2 v2.9.2-0.20210407182552-eb14f8319bdc
github.com/hashicorp/hcl/v2 v2.9.2-0.20220525143345-ab3cae0737bc
github.com/hashicorp/logutils v1.0.0
github.com/hashicorp/memberlist v0.3.1
github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69
Expand Down Expand Up @@ -116,7 +116,7 @@ require (
github.com/zclconf/go-cty-yaml v1.0.2
go.etcd.io/bbolt v1.3.5
go.uber.org/goleak v1.1.12
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd
golang.org/x/crypto v0.0.0-20220517005047-85d78b3ac167
golang.org/x/net v0.0.0-20220225172249-27dd8689420f
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/sys v0.0.0-20220517195934-5e4e11fc645e
Expand Down
35 changes: 4 additions & 31 deletions go.sum

Large diffs are not rendered by default.

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
4 changes: 2 additions & 2 deletions terraform/gcp/modules/hashistack/hashistack.tf
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ resource "google_compute_instance" "server" {
scheduling {
preemptible = var.enable_preemptible
# scheduling must have automatic_restart be false when preemptible is true.
automatic_restart = ! var.enable_preemptible
automatic_restart = !var.enable_preemptible
}

service_account {
Expand Down Expand Up @@ -245,7 +245,7 @@ resource "google_compute_instance" "client" {
scheduling {
preemptible = var.enable_preemptible
# scheduling must have automatic_restart be false when preemptible is true.
automatic_restart = ! var.enable_preemptible
automatic_restart = !var.enable_preemptible
}

service_account {
Expand Down

0 comments on commit 49ae238

Please sign in to comment.