diff --git a/.golangci.yml b/.golangci.yml index f4839517b..e733e60fc 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -56,16 +56,16 @@ linters: - ineffassign - interfacer - megacheck - #- misspell + - misspell - structcheck - typecheck - unconvert - varcheck fast: false -# issues: -# exclude: -# - abcdef +issues: + exclude: + - "composite literal uses unkeyed fields" # govet # exclude-use-default: true # max-per-linter: 0 # max-same: 0 diff --git a/Makefile b/Makefile index 82634901e..b1ce74331 100644 --- a/Makefile +++ b/Makefile @@ -218,14 +218,12 @@ test-e2e-race: gotest_extraflags=-race test-e2e-race: test-e2e ##@tests Run e2e tests with -race flag lint-install: - go get -u github.com/client9/misspell/cmd/misspell @# The following installs a specific version of golangci-lint, which is appropriate for a CI server to avoid different results from build to build - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $(GOPATH)/bin v1.6.1 + curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $(GOPATH)/bin v1.9.1 lint: @echo "lint" @golangci-lint run ./... - @find . -type f -not -path "./.ethereumtest/*" -not -path "./vendor/*" -not -path "./extkeys/mnemonic.go" -not -path "./extkeys/mnemonic_vectors.json" -print0 | xargs -0 misspell ci: lint mock dep-ensure test-unit test-e2e ##@tests Run all linters and tests at once