From 81467e130beeb14321eef54d09338f4d00c9e16e Mon Sep 17 00:00:00 2001
From: kvanzuijlen <8818390+kvanzuijlen@users.noreply.github.com>
Date: Fri, 19 Apr 2024 21:50:09 +0200
Subject: [PATCH 1/2] chore: use go-version-file instead of specifying version

Signed-off-by: kvanzuijlen <8818390+kvanzuijlen@users.noreply.github.com>
---
 .github/workflows/pr.yaml  | 4 ++--
 .github/workflows/push.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index e88e47c..e418e38 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -8,9 +8,9 @@ jobs:
     steps:
 
     - name: Set up Go
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v5
       with:
-        go-version: '1.21'
+        go-version-file: go.mod
       id: go
 
     - name: Check out the code
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 5b9314d..1c386c3 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -16,9 +16,9 @@ jobs:
     steps:
 
     - name: Set up Go
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v5
       with:
-        go-version: '1.21'
+        go-version-file: go.mod
       id: go
 
     - name: Check out code into the Go module directory

From 1de7020555562a25a76280a54dee3bdce752eb74 Mon Sep 17 00:00:00 2001
From: kvanzuijlen <8818390+kvanzuijlen@users.noreply.github.com>
Date: Tue, 23 Apr 2024 10:55:07 +0200
Subject: [PATCH 2/2] fix: put setup-go after checkout

Signed-off-by: kvanzuijlen <8818390+kvanzuijlen@users.noreply.github.com>
---
 .github/workflows/pr.yaml  | 6 +++---
 .github/workflows/push.yml | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index e418e38..003bc14 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -7,15 +7,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
+    - name: Check out the code
+      uses: actions/checkout@v2
+
     - name: Set up Go
       uses: actions/setup-go@v5
       with:
         go-version-file: go.mod
       id: go
 
-    - name: Check out the code
-      uses: actions/checkout@v2
-
     - name: Make CI
       run: make ci
 
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 1c386c3..aa1a322 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -15,15 +15,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v3
+
     - name: Set up Go
       uses: actions/setup-go@v5
       with:
         go-version-file: go.mod
       id: go
 
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v3
-
     # Fix issue of setup-gcloud
     - run: |
         sudo apt-get install python2.7