diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-04-08 02:02:30 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-08 02:02:30 -0700 |
| commit | d86729e743fb5a58b9364ee5e991b5db2e9dd600 (patch) | |
| tree | 8ae6789a7e7e5e52de2270bb3854f01dc55b9949 /Makefile | |
| parent | bc320be00bc584bd88525266d23a9d5edb9d44f8 (diff) | |
| parent | 23602de816b9ee3e92a8cbac295e955ba43fa283 (diff) | |
| download | podman-d86729e743fb5a58b9364ee5e991b5db2e9dd600.tar.gz podman-d86729e743fb5a58b9364ee5e991b5db2e9dd600.tar.bz2 podman-d86729e743fb5a58b9364ee5e991b5db2e9dd600.zip | |
Merge pull request #2865 from baude/pr/2864
Revert "Switch to golangci-lint"
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 16 |
1 files changed, 10 insertions, 6 deletions
@@ -98,7 +98,8 @@ endif touch $@ lint: .gopathok varlink_generate ## Execute the source code linter - golangci-lint run --build-tags="$(BUILDTAGS)" + @echo "checking lint" + @./.tool/lint gofmt: ## Verify the source code gofmt find . -name '*.go' ! -path './vendor/*' -exec gofmt -s -w {} \+ @@ -279,7 +280,7 @@ uninstall: .PHONY: install.tools -install.tools: .install.gitvalidation .install.golangci-lint .install.md2man .install.ginkgo ## Install needed tools +install.tools: .install.gitvalidation .install.gometalinter .install.md2man .install.ginkgo ## Install needed tools .install.vndr: .gopathok $(GO) get -u github.com/LK4D4/vndr @@ -294,10 +295,13 @@ install.tools: .install.gitvalidation .install.golangci-lint .install.md2man .in $(GO) get -u github.com/vbatts/git-validation; \ fi -.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 ;\ +.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; \ fi .install.md2man: .gopathok |