manual updates part 3

kubernetes-sigs · Oct 3, 2024 · bb3ed16 · bb3ed16
1 parent cb0ddf0
commit bb3ed16
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/pr-golangci-lint.yaml b/.github/workflows/pr-golangci-lint.yaml
@@ -30,5 +30,5 @@ jobs:
         uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86 # tag=v6.1.0
         with:
           version: v1.60.2
-          args: --out-format=colored-line-number --timeout=10m
+          args: --out-format=colored-line-number --config .golangci.yml
           working-directory: ${{matrix.working-directory}}
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,9 +1,9 @@
 run:
   timeout: 10m
-  go: "1.22"
   build-tags:
     - e2e
   allow-parallel-runners: true
+
 linters:
   disable-all: true
   enable:

diff --git a/Makefile b/Makefile
@@ -565,7 +565,7 @@ help: ## Display this help.
 
 .PHONY: lint
 lint: $(GOLANGCI_LINT) lint-latest ## Lint codebase.
-	$(GOLANGCI_LINT) run -v --timeout=8m0s --print-resources-usage --go=$(GO_VERSION) $(GOLANGCI_LINT_EXTRA_ARGS)
+	$(GOLANGCI_LINT) run -v --print-resources-usage --go=$(GO_VERSION) $(GOLANGCI_LINT_EXTRA_ARGS)
 
 .PHONY: lint-fix
 lint-fix: $(GOLANGCI_LINT) ## Lint the codebase and run auto-fixers if supported by the linter.