Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: drop removed deadline option #806

Merged
merged 2 commits into from
Dec 2, 2024
Merged

ci: drop removed deadline option #806

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8f7a59
ci: drop removed deadline option
spacewander Nov 25, 2024
23183d0
move timeout option to the config file
spacewander Nov 27, 2024
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
3 changes: 0 additions & 3 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
run:
deadline: 5m

Copy link
Contributor

Choose a reason for hiding this comment

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

What about set timeout: 5m here? FYI: https://golangci-lint.run/usage/configuration/#run-configuration

linters:
enable:
# sorted in alphabetic order
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ lint-go:
GOBIN=$(LOCALBIN) go install github.com/golangci/golangci-lint/cmd/golangci-lint@v$(GOLANGCI_LINT_VERSION); \
fi
$(foreach PKG, $(GO_PROD_MODULES), \
pushd ./${PKG} && $(LOCALBIN)/golangci-lint run --config=../.golangci.yml || exit 1; popd; \
pushd ./${PKG} && $(LOCALBIN)/golangci-lint run --config=../.golangci.yml --timeout=5m || exit 1; popd; \
)

.PHONY: fmt-go
Expand Down
Loading