From e3ecd8993cd58a1203e5147f2447318b47a30e96 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 7 Jun 2025 16:39:18 +0000
Subject: [PATCH] chore: update golangci-lint to v2 and fix breakage (#184)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

deps: update golangci/golangci-lint-action action to v8

Co-authored-by: Julian Tölle <julian.toelle97@gmail.com>
---
 .github/workflows/ci.yaml            |  4 +-
 .golangci.yaml                       | 61 +++++++++++++++++++++-------
 internal/git/git.go                  |  2 +-
 internal/releasepr/releasepr.go      |  2 +-
 internal/releasepr/releasepr_test.go |  5 +--
 5 files changed, 53 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 0c35301..6e7c542 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -18,9 +18,9 @@ jobs:
           go-version-file: go.mod
 
       - name: Run golangci-lint
-        uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84 # v6
+        uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8
         with:
-          version: v1.64.8 # renovate: datasource=github-releases depName=golangci/golangci-lint
+          version: v2.1.6 # renovate: datasource=github-releases depName=golangci/golangci-lint
           args: --timeout 5m
 
   test:
diff --git a/.golangci.yaml b/.golangci.yaml
index b3e717d..5af5a17 100644
--- a/.golangci.yaml
+++ b/.golangci.yaml
@@ -1,14 +1,38 @@
+version: "2"
 linters:
-  presets:
-    - bugs
-    - error
-    - import
-    - metalinter
-    - module
-    - unused
-
   enable:
+    - asasalint
+    - asciicheck
+    - bidichk
+    - bodyclose
+    - contextcheck
+    - durationcheck
+    - errchkjson
+    - errorlint
+    - exhaustive
+    - gocheckcompilerdirectives
+    - gochecksumtype
+    - gocritic
+    - gomoddirectives
+    - gomodguard
+    - gosec
+    - gosmopolitan
+    - loggercheck
+    - makezero
+    - musttag
+    - nilerr
+    - nilnesserr
+    - noctx
+    - protogetter
+    - reassign
+    - recvcheck
+    - rowserrcheck
+    - spancheck
+    - sqlclosecheck
     - testifylint
+    - unparam
+    - zerologlint
+    - revive
 
   disable:
     # preset error
@@ -18,10 +42,19 @@ linters:
     # preset import
     - depguard
 
-linters-settings:
-  gci:
-    sections:
-      - standard
-      - default
-      - localmodule
+  settings:
+    revive:
+      rules:
+        - name: exported
+          disabled: true
 
+formatters:
+  enable:
+    - gci
+    - goimports
+  settings:
+    gci:
+      sections:
+        - standard
+        - default
+        - localmodule
diff --git a/internal/git/git.go b/internal/git/git.go
index 128f94c..87d94d9 100644
--- a/internal/git/git.go
+++ b/internal/git/git.go
@@ -113,7 +113,7 @@ func (r *Repository) UpdateFile(_ context.Context, path string, create bool, upd
 	if err != nil {
 		return err
 	}
-	defer file.Close()
+	defer file.Close() //nolint:errcheck
 
 	content, err := io.ReadAll(file)
 	if err != nil {
diff --git a/internal/releasepr/releasepr.go b/internal/releasepr/releasepr.go
index 22eac0a..4437786 100644
--- a/internal/releasepr/releasepr.go
+++ b/internal/releasepr/releasepr.go
@@ -98,7 +98,7 @@ func (pr *ReleasePullRequest) parseVersioningFlags(overrides ReleaseOverrides) R
 			overrides.NextVersionType = versioning.NextVersionTypeAlpha
 		case LabelReleasePending, LabelReleaseTagged:
 			// These labels have no effect on the versioning.
-			break
+			continue
 		}
 	}
 
diff --git a/internal/releasepr/releasepr_test.go b/internal/releasepr/releasepr_test.go
index 09beaae..346bacb 100644
--- a/internal/releasepr/releasepr_test.go
+++ b/internal/releasepr/releasepr_test.go
@@ -1,7 +1,6 @@
 package releasepr
 
 import (
-	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -59,7 +58,7 @@ func TestReleasePullRequest_GetOverrides(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			got, err := tt.pr.GetOverrides()
-			if !tt.wantErr(t, err, fmt.Sprintf("GetOverrides()")) {
+			if !tt.wantErr(t, err, "GetOverrides()") {
 				return
 			}
 			assert.Equalf(t, tt.want, got, "GetOverrides()")
@@ -115,7 +114,7 @@ Suffix Things
 				},
 			}
 			got, err := pr.ChangelogText()
-			if !tt.wantErr(t, err, fmt.Sprintf("ChangelogText()")) {
+			if !tt.wantErr(t, err, "ChangelogText()") {
 				return
 			}
 			assert.Equalf(t, tt.want, got, "ChangelogText()")