From eeb61427bb67db0c385df8073eab2acdd18ab503 Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Mon, 13 Jan 2020 12:00:08 +0100 Subject: bump golangci-lint to 1.18.0 The latest versions have regressions in --skip-dirs where some linters will still run and error out. Signed-off-by: Valentin Rothberg --- .golangci.yml | 5 +++-- Makefile | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index fcf2582e8..bbf00aa05 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 b7ff5e571..239fd135c 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 -- cgit v1.2.3-54-g00ecf