Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
run:
deadline: 4m
timeout: 5m
skip-dirs:
skip-files:

Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ test: test-style
go vet $(GO_FILES)
test-style: setup
@echo "==> Running static validations and linters <=="
# Setting deadline to 5m as deafult is 1m
golangci-lint run --deadline=5m
# Setting timeout to 5m as deafult is 1m
golangci-lint run --timeout=5m
sanity-test:
go test -v ./test/sanity
build: setup
Expand All @@ -72,7 +72,7 @@ setup: clean
$Q go env

ifndef HAS_GOLANGCI
curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(GOPATH)/bin v1.19.1
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOPATH)/bin v1.30.0
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like the --deadline flag has been replaced with --timeout in the newer version - golangci/golangci-lint#793. Could you also update that as part of this PR?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done, updated also in .golangci.yml file

endif

.PHONY: mod
Expand Down