From ff238bc95010f00cafcf056e0b0a8c8c5b750dfa Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 24 Mar 2025 18:30:24 +0000
Subject: [PATCH] chore(deps): update dependency golangci/golangci-lint to v2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
---
 .golangci.yml | 28 +++++++++++++++-------------
 Makefile      |  2 +-
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index 4cd5096a..2a7081fa 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,16 +1,18 @@
----
-run:
-  concurrency: 6
-  timeout: 5m
-
+version: "2"
 linters:
   enable:
     - errorlint
-
-linters-settings:
-  errorlint:
-    # See https://golangci-lint.run/usage/linters/#errorlint.
-    # Only allow warnings about not using %w.
-    errorf-multi: false
-    asserts: false
-    comparison: false
+  settings:
+    errorlint:
+      # See https://golangci-lint.run/usage/linters/#errorlint.
+      # Only allow warnings about not using %w.
+      errorf-multi: false
+      asserts: false
+      comparison: false
+    staticcheck:
+      checks: ["all", "-ST1000", "-ST1003", "-ST1016", "-ST1020", "-ST1021", "-ST1022", "-ST1005", "-QF1008"] # golangci-lint's default, we add -ST1005 and -QF1008
+  exclusions:
+    presets:
+      - comments
+      - common-false-positives
+      - std-error-handling
diff --git a/Makefile b/Makefile
index 45c086f9..29e1ba2d 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ REGISTRIESDDIR ?= ${CONTAINERSCONFDIR}/registries.d
 # N/B: This value is managed by Renovate, manual changes are
 # possible, as long as they don't disturb the formatting
 # (i.e. DO NOT ADD A 'v' prefix!)
-GOLANGCI_LINT_VERSION := 1.64.8
+GOLANGCI_LINT_VERSION := 2.0.0
 
 export PATH := $(PATH):${GOBIN}