From ca7d2ea78c0ef92adb0941da711b9c0132fbd44b Mon Sep 17 00:00:00 2001
From: Andy Polyakov <appro@cryptogams.org>
Date: Mon, 27 May 2024 15:33:11 +0200
Subject: [PATCH] .golangci.yml: align with latest golangci-lint version.

---
 .github/workflows/golang-lint.yml |  3 ++-
 .golangci.yml                     | 26 +++++++++++++++-----------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/golang-lint.yml b/.github/workflows/golang-lint.yml
index 6bb9ad45..9a86c04e 100644
--- a/.github/workflows/golang-lint.yml
+++ b/.github/workflows/golang-lint.yml
@@ -7,6 +7,7 @@ on:
     paths:
       - 'bindings/go/*.go'
       - '.github/workflows/golang-lint.yml'
+      - '.golangci.yml'
   pull_request:
     branches:
       - master
@@ -24,7 +25,7 @@ jobs:
           cache: false
       - name: "go version"
         run: go version
-      - uses: golangci/golangci-lint-action@v4
+      - uses: golangci/golangci-lint-action@v6
         with:
           # Require: The version of golangci-lint to use.
           # When `install-mode` is `binary` (default) the value can be v1.2 or v1.2.3 or `latest` to use the latest version.
diff --git a/.golangci.yml b/.golangci.yml
index 8e721921..70a51eb3 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -2,17 +2,19 @@ linters:
   enable-all: true
   disable:
     # deprecated
-    - deadcode
-    - exhaustivestruct
-    - golint
-    - ifshort
-    - interfacer
-    - maligned
-    - nosnakecase
-    - scopelint
-    - structcheck
-    - varcheck
+    #- deadcode
+    - execinquery
+    #- exhaustivestruct
+    #- golint
+    #- ifshort
+    #- interfacer
+    #- maligned
+    #- nosnakecase
+    #- scopelint
+    #- structcheck
+    #- varcheck
     # just whining
+    - copyloopvar                       # go>=1.22
     - cyclop
     - dupword
     - forbidigo
@@ -27,7 +29,9 @@ linters:
     - gofumpt
     - goimports
     - gomnd
+    - intrange                          # go>=1.22
     - lll
+    - mnd
     - nlreturn
     - stylecheck
     - varnamelen
@@ -43,7 +47,7 @@ linters:
     - nonamedreturns
     - perfsprint
     - testpackage
-    # 75 active linters remaining including gosec, gosimple, govet, etc.
+    # 77 active linters remaining including gosec, gosimple, govet, etc.
 
 linters-settings:
   revive: