Skip to content

Commit fca09b0

Browse files
committed
Remove deprecated deadline option from go-lint
Was removed in 0.57.0 Fixes #1628 Signed-off-by: Chmouel Boudjnah <[email protected]>
1 parent 00b83ad commit fca09b0

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.golangci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
issues:
2+
exclude-dirs:
3+
- vendor
4+
- pkg/provider/gitea/structs
25
exclude-rules:
36
# Exclude some linters from running on tests files.
47
- path: _test\.go
@@ -7,9 +10,6 @@ issues:
710
run:
811
build-tags:
912
- e2e
10-
skip-dirs:
11-
- vendor
12-
- pkg/provider/gitea/structs
1313
linters-settings:
1414
gocritic:
1515
disabled-checks:

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ lint-go: ## runs go linter on all go files
8484
@$(GOLANGCI_LINT) run ./... --modules-download-mode=vendor \
8585
--max-issues-per-linter=0 \
8686
--max-same-issues=0 \
87-
--deadline $(TIMEOUT_UNIT)
87+
--timeout $(TIMEOUT_UNIT)
8888

8989
.PHONY: lint-yaml
9090
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
143143
@$(GOLANGCI_LINT) run ./... --modules-download-mode=vendor \
144144
--max-issues-per-linter=0 \
145145
--max-same-issues=0 \
146-
--deadline $(TIMEOUT_UNIT) \
146+
--timeout $(TIMEOUT_UNIT) \
147147
--fix
148148
@[[ -n `git status --porcelain` ]] && { echo "Go files has been cleaned 🧹. Cleaned Files: ";git status --porcelain ;} || echo "Go files are clean ✨"
149149

0 commit comments

Comments
 (0)