From 527f2a97ded7594316ba7910ccf0871dafc20c85 Mon Sep 17 00:00:00 2001
From: Seth Hoenig <seth.a.hoenig@gmail.com>
Date: Tue, 2 Aug 2022 07:36:35 -0500
Subject: [PATCH] build: update to go1.18.5

---
 .circleci/config.yml             | 8 ++++----
 .github/workflows/test-core.yaml | 2 +-
 .go-version                      | 2 +-
 contributing/README.md           | 2 +-
 scripts/release/mac-remote-build | 2 +-
 scripts/vagrant-linux-priv-go.sh | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 080f3fac008..d5da33a25ce 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -457,7 +457,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
@@ -470,7 +470,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
@@ -479,7 +479,7 @@ executors:
     environment:
       <<: *common_envs
       GOPATH: /Users/distiller/go
-      GOLANG_VERSION: 1.18.3
+      GOLANG_VERSION: 1.18.5
 
   go-windows:
     machine:
@@ -491,7 +491,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
 
diff --git a/.github/workflows/test-core.yaml b/.github/workflows/test-core.yaml
index c7317b31c8c..82ae3cb58f5 100644
--- a/.github/workflows/test-core.yaml
+++ b/.github/workflows/test-core.yaml
@@ -21,7 +21,7 @@ on:
       - 'website/**'
 env:
   VERBOSE: 1
-  GO_VERSION: 1.18.3
+  GO_VERSION: 1.18.5
   GOBIN: /usr/local/bin
   GOTESTARCH: amd64
   CONSUL_VERSION: 1.11.3
diff --git a/.go-version b/.go-version
index b9fb27ab4f7..8e8b0a9335a 100644
--- a/.go-version
+++ b/.go-version
@@ -1 +1 @@
-1.18.3
+1.18.5
diff --git a/contributing/README.md b/contributing/README.md
index 56e7873bbb5..fa7ea221dac 100644
--- a/contributing/README.md
+++ b/contributing/README.md
@@ -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
diff --git a/scripts/release/mac-remote-build b/scripts/release/mac-remote-build
index 5d7689d1a28..65f4b9dde9d 100755
--- a/scripts/release/mac-remote-build
+++ b/scripts/release/mac-remote-build
@@ -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"
diff --git a/scripts/vagrant-linux-priv-go.sh b/scripts/vagrant-linux-priv-go.sh
index b953976a3ea..df44b60dd8c 100755
--- a/scripts/vagrant-linux-priv-go.sh
+++ b/scripts/vagrant-linux-priv-go.sh
@@ -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