diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2019-04-05 11:02:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-05 11:02:41 -0400 |
| commit | bc320be00bc584bd88525266d23a9d5edb9d44f8 (patch) | |
| tree | c6d03492ac9684f22cdf5e553321569369f1cf59 /Makefile | |
| parent | ed8bd80d3f09fb5c82c53bde8d6779db2613f158 (diff) | |
| parent | 023eba20db1912a477eedff529fa52d356033a38 (diff) | |
| download | podman-bc320be00bc584bd88525266d23a9d5edb9d44f8.tar.gz podman-bc320be00bc584bd88525266d23a9d5edb9d44f8.tar.bz2 podman-bc320be00bc584bd88525266d23a9d5edb9d44f8.zip | |
Merge pull request #2742 from openSUSE/golangci-lint
Switch to golangci-lint
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 16 |
1 files changed, 6 insertions, 10 deletions
@@ -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 |