Extend golangci-lint timeout from 1m to 4m (new lint-install)

Signed-off-by: Thomas Stromberg <[email protected]>
tinkerbell · Sep 22, 2021 · 4dd9115 · 4dd9115
1 parent e94f138
commit 4dd9115
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,3 +1,7 @@
+run:
+  # The default runtime timeout is 1m, which doesn't work well on Github Actions.
+  timeout: 4m
+
 # NOTE: This file is populated by the lint-install tool. Local adjustments may be overwritten.
 linters-settings:
   cyclop:

diff --git a/Makefile b/Makefile
@@ -15,7 +15,7 @@ verify: lint
 help: ## Print this help
 	@grep --no-filename -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sed 's/:.*##/·/' | sort | column -ts '·' -c 120
 
-# BEGIN: lint-install --dockerfile=warn ../tink
+# BEGIN: lint-install --dockerfile=warn .
 # http://github.com/tinkerbell/lint-install
 
 GOLINT_VERSION ?= v1.42.0
@@ -59,4 +59,4 @@ out/linters/golangci-lint-$(GOLINT_VERSION)-$(LINT_ARCH):
 	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b out/linters $(GOLINT_VERSION)
 	mv out/linters/golangci-lint out/linters/golangci-lint-$(GOLINT_VERSION)-$(LINT_ARCH)
 
-# END: lint-install --dockerfile=warn ../tink
+# END: lint-install --dockerfile=warn .