From c164cc84d8f9da6e371885232f88e7cfa59c6da2 Mon Sep 17 00:00:00 2001
From: Christoph Deppisch <cdeppisch@redhat.com>
Date: Thu, 17 Aug 2023 10:00:15 +0200
Subject: [PATCH] chore: Fix golangci-lint-action CI

---
 .github/workflows/build.yml            | 4 ++--
 .github/workflows/nightly.yml          | 2 +-
 .github/workflows/release-cleanup.yaml | 2 +-
 .github/workflows/release.yml          | 2 +-
 .github/workflows/snapshot.yml         | 2 +-
 .github/workflows/validate.yml         | 7 +++----
 .golangci.yml                          | 9 +++++++++
 7 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4f35ef05..8393f557 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -37,7 +37,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
     - name: Set up JDK
       uses: actions/setup-java@v3
@@ -69,7 +69,7 @@ jobs:
         make check-licenses test package-artifacts
 
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     env:
       YAKS_IMAGE_NAME: "kind-registry:5000/yaks"
       YAKS_IMAGE_VERSION: "latest"
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 6d80712e..edce76de 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -24,7 +24,7 @@ on:
 
 jobs:
   release:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/main' && github.repository == 'citrusframework/yaks'
 
     steps:
diff --git a/.github/workflows/release-cleanup.yaml b/.github/workflows/release-cleanup.yaml
index 8e4706fb..2ae3662f 100644
--- a/.github/workflows/release-cleanup.yaml
+++ b/.github/workflows/release-cleanup.yaml
@@ -22,7 +22,7 @@ on:
 
 jobs:
   cleanup:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/main' && github.repository == 'citrusframework/yaks'
     strategy:
       matrix:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2e86ea5d..57a62a1e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -27,7 +27,7 @@ on:
 
 jobs:
   release:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/main' && github.repository == 'citrusframework/yaks'
 
     steps:
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
index d526cf34..bf49495f 100644
--- a/.github/workflows/snapshot.yml
+++ b/.github/workflows/snapshot.yml
@@ -25,7 +25,7 @@ on:
 
 jobs:
   release:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     if: github.repository == 'citrusframework/yaks'
 
     steps:
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 0a166360..04178a91 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -41,7 +41,7 @@ concurrency:
 
 jobs:
   validate:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Check out code
         uses: actions/checkout@v3
@@ -50,10 +50,9 @@ jobs:
         with:
           go-version: 1.21.x
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v3
         env:
           GOGC: 20
         with:
-          version: v1.46.2
-          skip-go-installation: true
+          version: v1.53.3
           args: --verbose --deadline 15m --config .golangci.yml
diff --git a/.golangci.yml b/.golangci.yml
index c1f28816..a54730e6 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -25,6 +25,7 @@ linters:
   disable:
     - containedctx
     - cyclop
+    - depguard
     - dupl
     - exhaustive
     - exhaustivestruct
@@ -51,12 +52,20 @@ linters:
     - nestif
     - nilnil
     - nlreturn
+    - nolintlint
+    - nosnakecase
     - paralleltest
+    - revive
+    - rowserrcheck
     - scopelint
+    - structcheck
+    - sqlclosecheck
+    - tagalign
     - tagliatelle
     - tenv
     - testpackage
     - varnamelen
+    - wastedassign
     - whitespace
     - wrapcheck
     - wsl