Merge pull request #244 from hairyhenderson/tweak-metalinter

Increase gometalinter timeout and make it go faster locally
hairyhenderson · Jan 29, 2018 · 272c06d · 272c06d
2 parents c9a7fb0 + ac0640e
commit 272c06d
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -115,7 +115,12 @@ docs/themes/hugo-material-docs:
 gen-docs: docs/themes/hugo-material-docs
 	cd docs/; hugo
 
+ifeq ("$(CI)","true")
 lint:
-	gometalinter -j 1 --vendor --deadline 70s --disable gotype --enable gofmt --enable goimports --enable misspell --enable unused --disable gas
+	gometalinter -j 1 --vendor --deadline 120s --disable gotype --enable gofmt --enable goimports --enable misspell --enable unused --disable gas
+else
+lint:
+	gometalinter -j $(shell nproc) --vendor --deadline 120s --disable gotype --enable gofmt --enable goimports --enable misspell --enable unused --disable gas
+endif
 
 .PHONY: gen-changelog clean test build-x compress-all build-release build build-integration-image test-integration-docker gen-docs lint