From 23602de816b9ee3e92a8cbac295e955ba43fa283 Mon Sep 17 00:00:00 2001
From: Brent Baude <bbaude@redhat.com>
Date: Fri, 5 Apr 2019 19:49:36 -0500
Subject: Revert "Switch to golangci-lint"

Signed-off-by: baude <bbaude@redhat.com>
---
 Makefile | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 86e3bfba0..1f4a7f6e7 100644
--- a/Makefile
+++ b/Makefile
@@ -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
-- 
cgit v1.2.3-54-g00ecf