Merge pull request #3665 from estesp/golangcideadline

fuweid · web-flow · commit d4802a64f973 · 2019-09-19T21:51:05.000+08:00
Move golangci-lint deadline to config file
diff --git a/.golangci.yml b/.golangci.yml
@@ -15,6 +15,7 @@ linters:
     - errcheck
 
 run:
+  deadline: 2m
   skip-dirs:
     - api
     - design
diff --git a/Makefile b/Makefile
@@ -121,7 +121,7 @@ all: binaries
 
 check: proto-fmt ## run all linters
 	@echo "$(WHALE) $@"
-	GOGC=75 golangci-lint run --deadline 2m
+	GOGC=75 golangci-lint run
 
 ci: check binaries checkprotos coverage coverage-integration ## to be used by the CI
 
