Merge pull request #354 from maratori/dependabot/docker/golangci/golangci-lint-v2.6.1

Bump golangci/golangci-lint from v2.5.0 to v2.6.1

Author: maratori

.github/workflows/ci.yaml

@@ -46,6 +46,16 @@ jobs:
           go-version: "1.25.4" # update together with dev.dockerfile
       - run: make test-latest-deps
 
+  test22:
+    name: "test go 1.22"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+      - uses: actions/setup-go@v6
+        with:
+          go-version: "1.22"
+      - run: make test
+
   lint:
     runs-on: ubuntu-latest
     steps:
@@ -55,7 +65,7 @@ jobs:
           go-version: "1.25.4" # update together with dev.dockerfile
       - uses: golangci/golangci-lint-action@v8
         with:
-          version: "v2.5.0" # update together with dev.dockerfile
+          version: "v2.6.1" # update together with dev.dockerfile
 
   lint-latest-deps:
     runs-on: ubuntu-latest
@@ -67,7 +77,7 @@ jobs:
       - run: make apply-latest-deps
       - uses: golangci/golangci-lint-action@v8
         with:
-          version: "v2.5.0" # update together with dev.dockerfile
+          version: "v2.6.1" # update together with dev.dockerfile
 
   check-tidy:
     name: go mod tidy

.golangci.yml

@@ -77,6 +77,7 @@ linters:
     - makezero # finds slice declarations with non-zero initial length
     - mirror # reports wrong mirror patterns of bytes/strings usage
     - mnd # detects magic numbers
+    - modernize # suggests simplifications to Go code, using modern language and library features
     - musttag # enforces field tags in (un)marshaled structs
     - nakedret # finds naked returns in functions greater than a specified function length
     - nestif # reports deeply nested if statements

dev.dockerfile

@@ -2,7 +2,7 @@
 FROM golang:1.25.4 AS go
 
 # update together with .github/workflows/ci.yml
-FROM golangci/golangci-lint:v2.5.0 AS linter
+FROM golangci/golangci-lint:v2.6.1 AS linter
 
 FROM go AS dev
 ENV INSIDE_DEV_CONTAINER=1

go.mod

@@ -1,6 +1,6 @@
 module github.com/maratori/testpackage
 
-go 1.22.0 // minimal supported version 1.18, tested all versions up to 1.24
+go 1.22.0 // minimal supported version 1.22, tested all versions up to 1.25
 
 require golang.org/x/tools v0.26.0
 

pkg/testpackage/testpackage.go

@@ -2,11 +2,11 @@ package testpackage
 
 import (
 	"flag"
+	"go/ast"
 	"regexp"
+	"slices"
 	"strings"
 
-	"go/ast"
-
 	"golang.org/x/tools/go/analysis"
 )
 
@@ -25,10 +25,8 @@ const (
 func processTestFile(pass *analysis.Pass, f *ast.File, allowedPackages []string) {
 	packageName := f.Name.Name
 
-	for _, p := range allowedPackages {
-		if p == packageName {
-			return
-		}
+	if slices.Contains(allowedPackages, packageName) {
+		return
 	}
 
 	if !strings.HasSuffix(packageName, "_test") {
@@ -51,7 +49,7 @@ func NewAnalyzer() *analysis.Analyzer {
 		Name:  "testpackage",
 		Doc:   "linter that makes you use a separate _test package",
 		Flags: fs,
-		Run: func(pass *analysis.Pass) (interface{}, error) {
+		Run: func(pass *analysis.Pass) (any, error) {
 			allowedPackages := strings.Split(allowPackagesStr, ",")
 			skipFile, err := regexp.Compile(skipFileRegexp)
 			if err != nil {