Update golint (#1157)

* golangci: replace deadline with timeout Signed-off-by: Xiang Dai <764524258@qq.com> * put concurrency into config file Signed-off-by: Xiang Dai <764524258@qq.com>
grafana · Oct 16, 2019 · 64c1de8 · 64c1de8
1 parent b6faee2
commit 64c1de8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -7,10 +7,10 @@ run:
   modules-download-mode: vendor
 
   # default concurrency is a available CPU number
-  concurrency: 2
+  concurrency: 16
 
   # timeout for analysis, e.g. 30s, 5m, default is 1m
-  deadline: 5m
+  timeout: 5m
 
   # exit code when at least one issue was found, default is 1
   issues-exit-code: 1
@@ -66,4 +66,4 @@ linters:
 
 issues:
   exclude:
-    - Error return value of .*log\.Logger\)\.Log\x60 is not checked 
+    - Error return value of .*log\.Logger\)\.Log\x60 is not checked
diff --git a/Makefile b/Makefile
@@ -212,7 +212,7 @@ publish: dist
 ########
 
 lint:
-	GO111MODULE=on GOGC=10 golangci-lint run --timeout=5m -j 16
+	GO111MODULE=on GOGC=10 golangci-lint run
 
 ########
 # Test #