diff options
| -rw-r--r-- | .golangci.yml | 29 | ||||
| -rw-r--r-- | .revive.toml | 27 | ||||
| -rw-r--r-- | Makefile | 29 |
3 files changed, 31 insertions, 54 deletions
diff --git a/.golangci.yml b/.golangci.yml index 9e64d71b59..235bb76715 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -16,6 +16,7 @@ linters: - gocritic - bidichk - ineffassign + - revive enable-all: false disable-all: true fast: false @@ -28,6 +29,34 @@ linters-settings: disabled-checks: - ifElseChain - singleCaseSwitch # Every time this occurred in the code, there was no other way. + revive: + ignore-generated-header: false + severity: warning + confidence: 0.8 + errorCode: 1 + warningCode: 1 + rules: + - name: blank-imports + - name: context-as-argument + - name: context-keys-type + - name: dot-imports + - name: error-return + - name: error-strings + - name: error-naming + - name: exported + - name: if-return + - name: increment-decrement + - name: var-naming + - name: var-declaration + - name: package-comments + - name: range + - name: receiver-naming + - name: time-naming + - name: unexported-return + - name: indent-error-flow + - name: errorf + - name: duplicated-imports + - name: modifies-value-receiver issues: exclude-rules: diff --git a/.revive.toml b/.revive.toml deleted file mode 100644 index 54f075f84f..0000000000 --- a/.revive.toml +++ /dev/null @@ -1,27 +0,0 @@ -ignoreGeneratedHeader = false -severity = "warning" -confidence = 0.8 -errorCode = 1 -warningCode = 1 - -[rule.blank-imports] -[rule.context-as-argument] -[rule.context-keys-type] -[rule.dot-imports] -[rule.error-return] -[rule.error-strings] -[rule.error-naming] -[rule.exported] -[rule.if-return] -[rule.increment-decrement] -[rule.var-naming] -[rule.var-declaration] -[rule.package-comments] -[rule.range] -[rule.receiver-naming] -[rule.time-naming] -[rule.unexported-return] -[rule.indent-error-flow] -[rule.errorf] -[rule.duplicated-imports] -[rule.modifies-value-receiver] @@ -186,8 +186,6 @@ help: @echo " - generate-swagger generate the swagger spec from code comments" @echo " - swagger-validate check if the swagger spec is valid" @echo " - golangci-lint run golangci-lint linter" - @echo " - revive run revive linter" - @echo " - misspell check for misspellings" @echo " - vet examines Go source code and reports suspicious constructs" @echo " - test[\#TestSpecificName] run unit test" @echo " - test-sqlite[\#TestSpecificName] run integration test for sqlite" @@ -280,29 +278,6 @@ errcheck: @echo "Running errcheck..." @errcheck $(GO_PACKAGES) -.PHONY: revive -revive: - @hash revive > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ - $(GO) install github.com/mgechev/revive@v1.1.2; \ - fi - @revive -config .revive.toml -exclude=./vendor/... ./... - -.PHONY: misspell-check -misspell-check: - @hash misspell > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ - $(GO) install github.com/client9/misspell/cmd/misspell@v0.3.4; \ - fi - @echo "Running misspell-check..." - @$(GO) run build/code-batch-process.go misspell -error -i unknwon '{file-list}' - -.PHONY: misspell -misspell: - @hash misspell > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ - $(GO) install github.com/client9/misspell/cmd/misspell@v0.3.4; \ - fi - @echo "Running go misspell..." - @$(GO) run build/code-batch-process.go misspell -w -i unknwon '{file-list}' - .PHONY: fmt-check fmt-check: # get all go files and run go fmt on them @@ -320,7 +295,7 @@ checks: checks-frontend checks-backend checks-frontend: svg-check .PHONY: checks-backend -checks-backend: misspell-check test-vendor swagger-check swagger-validate +checks-backend: test-vendor swagger-check swagger-validate .PHONY: lint lint: lint-frontend lint-backend @@ -332,7 +307,7 @@ lint-frontend: node_modules npx editorconfig-checker templates .PHONY: lint-backend -lint-backend: golangci-lint revive vet +lint-backend: golangci-lint vet .PHONY: watch watch: |