diff --git a/.golangci.yml b/.golangci.yml new file mode 100644 index 000000000..d9021044f --- /dev/null +++ b/.golangci.yml @@ -0,0 +1,19 @@ +run: + deadline: 5m + skip-files: + - bindata_assetfs.go + +linters: + enable: + - golint + - dupl + - goconst + - gocyclo + +linters-settings: + govet: + check-shadowing: true + golint: + min-confidence: 0 + dupl: + threshold: 200 diff --git a/.travis.yml b/.travis.yml index 600ef379c..a6062640b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,6 +39,8 @@ jobs: - stage: Lint Go code <<: *DEFAULTS_GO + before_script: + - make mock-assets script: make lint-go - stage: Lint JavaScript code diff --git a/Makefile b/Makefile index 08ac10d31..b3be7737c 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ endif .build/deps-lint-go.ok: @mkdir -p .build - go get -u github.com/golang/lint/golint + go get -u github.com/golangci/golangci-lint/cmd/golangci-lint touch $@ .build/deps-build-node.ok: ui/package.json ui/package-lock.json @@ -103,7 +103,7 @@ run-docker: docker-image .PHONY: lint-go lint-go: .build/deps-lint-go.ok - golint ./... | (egrep -v "^vendor/|^bindata_assetfs.go" || true) + golangci-lint run .PHONY: lint-js lint-js: .build/deps-build-node.ok