diff --git a/.golangci.yml b/.golangci.yml index fcf2582e82..bbf00aa052 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -6,8 +6,9 @@ run: - selinux concurrency: 6 deadline: 5m + skip-dirs-use-default: true skip-dirs: - - dependencies/* + - dependencies - contrib - test/e2e - docs @@ -18,7 +19,7 @@ run: linters: disable-all: true enable: - - bodyclose + # - bodyclose - deadcode - depguard # dupl really overdid it; disabling diff --git a/Makefile b/Makefile index b7ff5e5715..239fd135cb 100644 --- a/Makefile +++ b/Makefile @@ -506,7 +506,7 @@ endef .install.golangci-lint: .gopathok if [ ! -x "$(GOBIN)/golangci-lint" ]; then \ - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(GOBIN)/ v1.17.1; \ + curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(GOBIN)/ v1.18.0; \ fi .install.md2man: .gopathok