summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Henderson <dhenderson@gmail.com>2018-01-28 21:24:07 -0500
committerGitHub <noreply@github.com>2018-01-28 21:24:07 -0500
commit272c06db2d651ab9d93bf4e2c7b30d0b40d04d5f (patch)
treee8dbb134119e909e8b4f309c73d0659e62004fb9
parentc9a7fb08cf3d6c688316ea620ad26ce6a681e439 (diff)
parentac0640ea2bc23b2364d5c7ef7fbc39c1702e1cc4 (diff)
Merge pull request #244 from hairyhenderson/tweak-metalinter
Increase gometalinter timeout and make it go faster locally
-rw-r--r--Makefile7
1 files changed, 6 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 07c851a1..105c6bcf 100644
--- 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