From ee4ffcb5f42fc4bedbd4685cf2699f6dcf1a96c0 Mon Sep 17 00:00:00 2001 From: Christopher Crone Date: Mon, 18 May 2020 15:12:29 +0200 Subject: [PATCH 1/2] Extend lint timeout Signed-off-by: Christopher Crone --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5c5f4373..cfeaf303 100644 --- a/Makefile +++ b/Makefile @@ -62,7 +62,7 @@ cache-clear: ## Clear the builder cache @docker builder prune --force --filter type=exec.cachemount --filter=unused-for=24h lint: ## run linter(s) - docker run --rm -t -v $(PWD):/app -w /app golangci/golangci-lint:v1.27-alpine golangci-lint run ./... + docker run --rm -t -v $(PWD):/app -w /app golangci/golangci-lint:v1.27-alpine golangci-lint run --timeout 10m0s ./... help: ## Show help @echo Please specify a build target. The choices are: From 7e81f9e147cba465aef54fecfa849b14f4737437 Mon Sep 17 00:00:00 2001 From: Christopher Crone Date: Mon, 18 May 2020 15:12:52 +0200 Subject: [PATCH 2/2] Appease linter Signed-off-by: Christopher Crone --- cli/main_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/cli/main_test.go b/cli/main_test.go index a8a6c9f7..76638e20 100644 --- a/cli/main_test.go +++ b/cli/main_test.go @@ -44,6 +44,7 @@ var contextSetConfig = []byte(`{ func TestDetermineCurrentContext(t *testing.T) { d, err := ioutil.TempDir("", "") + // nolint errcheck defer os.RemoveAll(d) require.NoError(t, err) err = ioutil.WriteFile(filepath.Join(d, config.ConfigFileName), contextSetConfig, 0644)