From db643aee8ae552fe05aac444a4042fa61efe3ed0 Mon Sep 17 00:00:00 2001
From: Cameron Garrison <cgarriso@redhat.com>
Date: Tue, 11 Jun 2024 10:43:35 -0400
Subject: [PATCH] bump lint action version, pull go versions from go.mod

---
 .github/workflows/build.yaml     | 4 ++--
 .github/workflows/lint.yml       | 5 +++--
 .github/workflows/push-image.yml | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 541fe9b..4ce8c08 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
-          go-version: 1.20.x
+          go-version-file: go.mod
       - run: make
\ No newline at end of file
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 2453eb2..9d48a2e 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Set up Go env
         uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version-file: go.mod
       - uses: actions/checkout@v4
         with:
           fetch-depth: 1
@@ -30,7 +30,8 @@ jobs:
           make deps generate
         shell: bash
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v4
         with:
           version: v1.53
+          args: --sort-results
           working-directory: go/src/github.com/${{ env.REPOSITORY }}
diff --git a/.github/workflows/push-image.yml b/.github/workflows/push-image.yml
index 7a998b9..4b1c1fe 100644
--- a/.github/workflows/push-image.yml
+++ b/.github/workflows/push-image.yml
@@ -20,5 +20,5 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version-file: go.mod
       - run: make image