Merge pull request #1982 from ktock/golangci-lint-action-6.5.0

Bump up golangci-lint action to 6.5.0
containerd · Feb 26, 2025 · 0bbee9a · 0bbee9a
2 parents 65f684d + 39a7cc5
commit 0bbee9a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -40,7 +40,7 @@ jobs:
       with:
         go-version: '1.24.x'
     - name: golangci-lint
-      uses: golangci/golangci-lint-action@v6.3.3
+      uses: golangci/golangci-lint-action@v6.5.0
       with:
         version: v1.64.5
         args: --verbose --timeout=10m

diff --git a/.golangci.yml b/.golangci.yml
@@ -27,7 +27,7 @@ linters-settings:
             desc: The containerd log package was migrated to a separate module. Use github.com/containerd/log instead.
 
 run:
-  deadline: 4m
+  timeout: 4m
 
 issues:
   exclude-rules: