Remove deprecated deadline option from go-lint

Was removed in 0.57.0 Fixes #1628 Signed-off-by: Chmouel Boudjnah <[email protected]>
openshift-pipelines · Mar 20, 2024 · 6b314ca · 6b314ca
1 parent 803b25f
commit 6b314ca
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,4 +1,7 @@
 issues:
+  exclude-dirs:
+    - vendor
+    - pkg/provider/gitea/structs
   exclude-rules:
     # Exclude some linters from running on tests files.
     - path: _test\.go
@@ -7,9 +10,6 @@ issues:
 run:
   build-tags:
     - e2e
-  skip-dirs:
-    - vendor
-    - pkg/provider/gitea/structs
 linters-settings:
   gocritic:
     disabled-checks:

diff --git a/Makefile b/Makefile
@@ -84,7 +84,7 @@ lint-go: ## runs go linter on all go files
 	@$(GOLANGCI_LINT) run ./... --modules-download-mode=vendor \
 							--max-issues-per-linter=0 \
 							--max-same-issues=0 \
-							--deadline $(TIMEOUT_UNIT)
+							--timeout $(TIMEOUT_UNIT)
 
 .PHONY: lint-yaml
 lint-yaml: ${YAML_FILES} ## runs yamllint on all yaml files
@@ -143,7 +143,7 @@ fix-golangci-lint: ## run golangci-lint and fix on all go files
 	@$(GOLANGCI_LINT) run ./... --modules-download-mode=vendor \
 							--max-issues-per-linter=0 \
 							--max-same-issues=0 \
-							--deadline $(TIMEOUT_UNIT) \
+							--timeout $(TIMEOUT_UNIT) \
 							--fix
 	@[[ -n `git status --porcelain` ]] && { echo "Go files has been cleaned 🧹. Cleaned Files: ";git status --porcelain ;} || echo "Go files are clean ✨"