From 296eaff73c5ffc9bdf9bc5952dbfe834412d8ff3 Mon Sep 17 00:00:00 2001
From: Ian Davis <jungziege@gmail.com>
Date: Fri, 14 Oct 2022 15:13:11 +0100
Subject: [PATCH] Use GO_VERSION to set / verify go version

---
 .circleci/config.yml   | 14 ++++++++++++--
 .circleci/template.yml | 14 ++++++++++++--
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 978bc6350..e4adcc90f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,6 +5,7 @@ orbs:
 executors:
   golang:
     docker:
+      # Must match GO_VERSION in project root
       - image: cimg/go:1.18.1
     resource_class: 2xlarge
   ubuntu:
@@ -44,6 +45,15 @@ commands:
       - when:
           condition: << parameters.linux >>
           steps:
+            - run:
+                name: Check Go Version
+                command: |
+                  v=`go version | { read _ _ v _; echo ${v#go}; }`
+                  if [[ $v != `cat GO_VERSION` ]]; then
+                    echo "GO_VERSION file does not match the go version being used."
+                    echo "Please update image to cimg/go:`cat GO_VERSION` or update GO_VERSION to $v."
+                    exit 1
+                  fi
             - run: sudo apt-get update
             - run: sudo apt-get install ocl-icd-opencl-dev libhwloc-dev
       - when:
@@ -52,7 +62,7 @@ commands:
             - run:
                 name: Install Go
                 command: |
-                  curl https://dl.google.com/go/go1.18.1.darwin-amd64.pkg -o /tmp/go.pkg && \
+                  curl https://dl.google.com/go/go`cat GO_VERSION`.darwin-amd64.pkg -o /tmp/go.pkg && \
                   sudo installer -pkg /tmp/go.pkg -target /
             - run:
                 name: Export Go
@@ -428,7 +438,7 @@ jobs:
           name: Update Go
           command: |
             sudo rm -rf /usr/local/go && \
-            curl -L https://golang.org/dl/go1.18.1.linux-amd64.tar.gz -o /tmp/go.tar.gz && \
+            curl -L https://golang.org/dl/go`cat GO_VERSION`.linux-amd64.tar.gz -o /tmp/go.tar.gz && \
             sudo tar -C /usr/local -xvf /tmp/go.tar.gz
       - run: go version
       - run:
diff --git a/.circleci/template.yml b/.circleci/template.yml
index 3a25900cf..9a54bf55d 100644
--- a/.circleci/template.yml
+++ b/.circleci/template.yml
@@ -5,6 +5,7 @@ orbs:
 executors:
   golang:
     docker:
+      # Must match GO_VERSION in project root
       - image: cimg/go:1.18.1
     resource_class: 2xlarge
   ubuntu:
@@ -44,6 +45,15 @@ commands:
       - when:
           condition: << parameters.linux >>
           steps:
+            - run:
+                name: Check Go Version
+                command: |
+                  v=`go version | { read _ _ v _; echo ${v#go}; }`
+                  if [["[[ $v != `cat GO_VERSION` ]]"]]; then
+                    echo "GO_VERSION file does not match the go version being used."
+                    echo "Please update image to cimg/go:`cat GO_VERSION` or update GO_VERSION to $v."
+                    exit 1
+                  fi
             - run: sudo apt-get update
             - run: sudo apt-get install ocl-icd-opencl-dev libhwloc-dev
       - when:
@@ -52,7 +62,7 @@ commands:
             - run:
                 name: Install Go
                 command: |
-                  curl https://dl.google.com/go/go1.18.1.darwin-amd64.pkg -o /tmp/go.pkg && \
+                  curl https://dl.google.com/go/go`cat GO_VERSION`.darwin-amd64.pkg -o /tmp/go.pkg && \
                   sudo installer -pkg /tmp/go.pkg -target /
             - run:
                 name: Export Go
@@ -428,7 +438,7 @@ jobs:
           name: Update Go
           command: |
             sudo rm -rf /usr/local/go && \
-            curl -L https://golang.org/dl/go1.18.1.linux-amd64.tar.gz -o /tmp/go.tar.gz && \
+            curl -L https://golang.org/dl/go`cat GO_VERSION`.linux-amd64.tar.gz -o /tmp/go.tar.gz && \
             sudo tar -C /usr/local -xvf /tmp/go.tar.gz
       - run: go version
       - run: