summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorSascha Grunert <sgrunert@suse.com>2019-03-22 09:10:41 +0100
committerSascha Grunert <sgrunert@suse.com>2019-04-04 09:06:32 +0200
commit42830ab711aadb69e344a58627c6c7cfee45ddc9 (patch)
treedc87c9b7634d01d5d933d3f669972194440e1e01 /Makefile
parente28d30c93b2085379134cbb5408d119d71e8d7d3 (diff)
downloadpodman-42830ab711aadb69e344a58627c6c7cfee45ddc9.tar.gz
podman-42830ab711aadb69e344a58627c6c7cfee45ddc9.tar.bz2
podman-42830ab711aadb69e344a58627c6c7cfee45ddc9.zip
Update lint to use golangci-lint
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile16
1 files changed, 6 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 1f4a7f6e7..86e3bfba0 100644
--- a/Makefile
+++ b/Makefile
@@ -98,8 +98,7 @@ endif
touch $@
lint: .gopathok varlink_generate ## Execute the source code linter
- @echo "checking lint"
- @./.tool/lint
+ golangci-lint run --build-tags="$(BUILDTAGS)"
gofmt: ## Verify the source code gofmt
find . -name '*.go' ! -path './vendor/*' -exec gofmt -s -w {} \+
@@ -280,7 +279,7 @@ uninstall:
.PHONY: install.tools
-install.tools: .install.gitvalidation .install.gometalinter .install.md2man .install.ginkgo ## Install needed tools
+install.tools: .install.gitvalidation .install.golangci-lint .install.md2man .install.ginkgo ## Install needed tools
.install.vndr: .gopathok
$(GO) get -u github.com/LK4D4/vndr
@@ -295,13 +294,10 @@ install.tools: .install.gitvalidation .install.gometalinter .install.md2man .ins
$(GO) get -u github.com/vbatts/git-validation; \
fi
-.install.gometalinter: .gopathok
- if [ ! -x "$(GOBIN)/gometalinter" ]; then \
- $(GO) get -u github.com/alecthomas/gometalinter; \
- cd $(FIRST_GOPATH)/src/github.com/alecthomas/gometalinter; \
- git checkout e8d801238da6f0dfd14078d68f9b53fa50a7eeb5; \
- $(GO) install github.com/alecthomas/gometalinter; \
- $(GOBIN)/gometalinter --install; \
+.install.golangci-lint: .gopathok
+ if [ ! -x "$(GOBIN)/golangci-lint" ]; then \
+ curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh |\
+ sh -s -- -b $(GOBIN) v1.15.0 ;\
fi
.install.md2man: .gopathok