diff --git a/.github/workflows/PR.yaml b/.github/workflows/PR.yaml index 6a658c8f..d153a88e 100644 --- a/.github/workflows/PR.yaml +++ b/.github/workflows/PR.yaml @@ -13,10 +13,11 @@ jobs: golint: runs-on: windows-2022 steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: golangci-lint uses: golangci/golangci-lint-action@a4f60bb28d35aeee14e6880718e0c85ff1882e64 with: + args: --timeout=10m version: v1.55 test: diff --git a/.golangci.json b/.golangci.json index 174dffac..dde8584a 100644 --- a/.golangci.json +++ b/.golangci.json @@ -9,15 +9,14 @@ "gofmt" ] }, - "run": { - "skip-files": [ + "issues": { + "exclude-files": [ "/zz_generated_", "docs", "tests", "scripts", "charts", "package" - ], - "deadline": "5m" + ] } } diff --git a/magefiles/magefile.go b/magefiles/magefile.go index c7328083..da5e535c 100644 --- a/magefiles/magefile.go +++ b/magefiles/magefile.go @@ -86,7 +86,7 @@ func Validate() error { envs := map[string]string{"GOOS": "windows", "ARCH": "amd64", "CGO_ENABLED": "0", "MAGEFILE_VERBOSE": "1"} log.Printf("[Validate] Running: golangci-lint \n") - if err := sh.RunWithV(envs, "golangci-lint", "run"); err != nil { + if err := sh.RunWithV(envs, "golangci-lint", "run", "--timeout", "10m"); err != nil { return err }