From 67090f7d57887a10fcdb028d1394a2da4cbdcb10 Mon Sep 17 00:00:00 2001
From: Kian Parvin <46668016+kian99@users.noreply.github.com>
Date: Fri, 8 Dec 2023 12:06:48 +0200
Subject: [PATCH] Ensure all workflows use correct go version (#1115)

---
 .github/workflows/charm-release.yaml | 3 +++
 .github/workflows/ci.yaml            | 6 ++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/charm-release.yaml b/.github/workflows/charm-release.yaml
index bc9c76c6c..8bd2537e2 100644
--- a/.github/workflows/charm-release.yaml
+++ b/.github/workflows/charm-release.yaml
@@ -31,6 +31,9 @@ jobs:
         with:
           fetch-depth: 0
           fetch-tags: true 
+      - uses: actions/setup-go@v4
+        with:
+          go-version-file: 'go.mod'
       - name: Build local images
         run: make jimm-image
       - name: Upload charm to charmhub
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index b2da81bfe..cdc02118a 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -62,11 +62,9 @@ jobs:
     # So if the compose returns with exit code 0 then the JIMM server successfully started.
     steps:
       - uses: actions/checkout@v4
-      # Specify a specific version of Go until GH runners no longer comes with anything below 1.21
-      - name: Setup Go 1.21.x
-        uses: actions/setup-go@v4
+      - uses: actions/setup-go@v4
         with:
-          go-version: '1.21.x'
+          go-version-file: 'go.mod'
       - name: Pull candid repo for test environment
         run: |
           git clone https://github.com/canonical/candid.git ./tmp/candid