summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValentin Rothberg <rothberg@redhat.com>2020-01-13 12:00:08 +0100
committerValentin Rothberg <rothberg@redhat.com>2020-01-13 14:27:02 +0100
commiteeb61427bb67db0c385df8073eab2acdd18ab503 (patch)
treeb7f026538829dd98da48c70807f3cb3f250fc6ff
parent6041f707cae1e90b01f1fd4c4c3b48ccc71005ba (diff)
downloadpodman-eeb61427bb67db0c385df8073eab2acdd18ab503.tar.gz
podman-eeb61427bb67db0c385df8073eab2acdd18ab503.tar.bz2
podman-eeb61427bb67db0c385df8073eab2acdd18ab503.zip
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 <rothberg@redhat.com>
-rw-r--r--.golangci.yml5
-rw-r--r--Makefile2
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