Merge pull request #163 from Fedosin/fix_linter

🐛 Increase golangci-lint timeout to 10 minutes
kubernetes-sigs · Jun 14, 2023 · 507313f · 507313f
2 parents db0b45a + 8c9cabf
commit 507313f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -18,5 +18,5 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.52.2
+          version: v1.53.2
           args: --timeout 15m 
diff --git a/Makefile b/Makefile
@@ -66,7 +66,7 @@ CONTROLLER_GEN_VER := v0.11.4
 CONTROLLER_GEN_BIN := controller-gen
 CONTROLLER_GEN := $(TOOLS_BIN_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER)
 
-GOLANGCI_LINT_VER := v1.52.2
+GOLANGCI_LINT_VER := v1.53.2
 GOLANGCI_LINT_BIN := golangci-lint
 GOLANGCI_LINT := $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)
 
@@ -245,7 +245,7 @@ operator: ## Build operator binary
 
 .PHONY: lint
 lint: $(GOLANGCI_LINT) ## Lint the codebase
-	$(GOLANGCI_LINT) run -v $(GOLANGCI_LINT_EXTRA_ARGS)
+	$(GOLANGCI_LINT) run -v $(GOLANGCI_LINT_EXTRA_ARGS) --timeout=10m
 
 .PHONY: lint-fix
 lint-fix: $(GOLANGCI_LINT) ## Lint the codebase and run auto-fixers if supported by the linter

diff --git a/scripts/ci-make.sh b/scripts/ci-make.sh
@@ -20,4 +20,4 @@ set -o pipefail
 
 REPO_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 
-cd "${REPO_ROOT}" && make lint docker-build
+cd "${REPO_ROOT}" && make docker-build
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,4 +20,4 @@ set -o pipefail

		REPO_ROOT=$(dirname "${BASH_SOURCE[0]}")/..

		cd "${REPO_ROOT}" && make lint docker-build
		cd "${REPO_ROOT}" && make docker-build