Merge pull request #14 from dmcgowan/update-lint-version

Bump golangci lint version and minimum go version

Author: mxpv

.github/workflows/ci.yml

@@ -38,9 +38,9 @@ jobs:
           cache: false # see actions/setup-go#368
 
       - uses: actions/checkout@v6
-      - uses: golangci/golangci-lint-action@v6
+      - uses: golangci/golangci-lint-action@v9
         with:
-          version: v1.61.0
+          version: v2.6.2
           skip-cache: true
           args: --timeout=5m
 

.golangci.yml

@@ -1,32 +1,49 @@
+version: "2"
 linters:
   enable:
     - copyloopvar
-    - gofmt
-    - goimports
+    - dupword
     - gosec
-    - ineffassign
     - misspell
     - nolintlint
     - revive
-    - staticcheck
-    - tenv # Detects using os.Setenv instead of t.Setenv since Go 1.17
     - unconvert
-    - unused
-    - govet
-    - dupword # Checks for duplicate words in the source code
   disable:
     - errcheck
-
-run:
-  timeout: 5m
-
-issues:
-  exclude-dirs:
-    - api
-    - cluster
-    - design
-    - docs
-    - docs/man
-    - releases
-    - reports
-    - test # e2e scripts
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - api
+      - cluster
+      - design
+      - docs
+      - docs/man
+      - releases
+      - reports
+      - test
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - api
+      - cluster
+      - design
+      - docs
+      - docs/man
+      - releases
+      - reports
+      - test
+      - third_party$
+      - builtin$
+      - examples$

go.mod

@@ -1,6 +1,6 @@
 module github.com/containerd/plugin
 
-go 1.20
+go 1.22
 
 require github.com/opencontainers/image-spec v1.1.0
 

plugin_test.go

@@ -520,15 +520,15 @@ func testPlugin(t Type, id string, i interface{}, err error) *Plugin {
 func BenchmarkGraph(b *testing.B) {
 	register := testRegistry()
 	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
+	for range b.N {
 		register.Graph(mockPluginFilter)
 	}
 }
 
 func BenchmarkUnique(b *testing.B) {
 	register := testRegistry()
 	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
+	for range b.N {
 		checkUnique(register, &Registration{
 			Type: InternalPlugin,
 			ID:   "new",