Merge pull request #2388 from kolyshkin/ci-extra

ci: fix running extra linters

Author: openshift-merge-bot[bot]

.github/workflows/validate.yml

@@ -42,11 +42,10 @@ jobs:
         version: "${{ env.LINT_VERSION }}"
         args: --verbose
     # Extra linters, only checking new code from a pull request.
-    - name: Extra golangci-lint config. switcharoo
-      run: mv .golangci-extra.yml golangci.yml
     - name: lint-extra
       uses: golangci/golangci-lint-action@v6
       with:
+        args: --config=.golangci-extra.yml
         version: "${{ env.LINT_VERSION }}"
         only-new-issues: true
 

.golangci-extra.yml

@@ -14,8 +14,7 @@ run:
     - systemd
     - exclude_graphdriver_btrfs
     - containers_image_openpgp
-  concurrency: 6
-  deadline: 5m
+  timeout: 5m
 
 linters:
   disable-all: true