From c268c4e767fd04657d17dbe50e788ada67d15c1d Mon Sep 17 00:00:00 2001
From: Adrian Brink <adrian@brink-holdings.com>
Date: Wed, 20 Dec 2017 10:33:24 +0100
Subject: [PATCH] Update Circle and Makefile to run tests/linting on CI

---
 Makefile   | 20 ++++++++++----------
 circle.yml |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index cadf85442..9e7a9c901 100644
--- a/Makefile
+++ b/Makefile
@@ -74,23 +74,23 @@ metalinter_all:
 	protoc $(INCLUDE) --lint_out=. types/*.proto
 	gometalinter.v2 --vendor --deadline=600s --enable-all --disable=lll ./...
 
-metalinter:
-  @ echo "==> Running linter"
+metalinter_test:
+	@ echo "==> Running linter"
 	gometalinter.v2 --vendor --deadline=600s --disable-all  \
 		--enable=maligned \
 		--enable=deadcode \
 		--enable=goconst \
 		--enable=goimports \
 		--enable=gosimple \
-	 	--enable=ineffassign \
+		--enable=ineffassign \
 		--enable=megacheck \
-	 	--enable=misspell \
-	  --enable=staticcheck \
+		--enable=misspell \
+		--enable=staticcheck \
 		--enable=safesql \
-	  --enable=structcheck \
-	  --enable=unconvert \
+		--enable=structcheck \
+		--enable=unconvert \
 		--enable=unused \
-	  --enable=varcheck \
+		--enable=varcheck \
 		--enable=vetshadow \
 		./...
 
@@ -100,8 +100,8 @@ metalinter:
 		#--enable=gocyclo \
 		#--enable=golint \ <== comments on anything exported
 		#--enable=gotype \
-	  #--enable=interfacer \
-	  #--enable=unparam \
+		#--enable=interfacer \
+		#--enable=unparam \
 		#--enable=vet \
 
 build-docker:
diff --git a/circle.yml b/circle.yml
index 95d1dea5e..32ce4a7a0 100644
--- a/circle.yml
+++ b/circle.yml
@@ -15,7 +15,7 @@ checkout:
 
 test:
   override:
-    - cd $REPO && make get_vendor_deps && make metalinter_test && make test_integrations
+    - cd $REPO && make get_vendor_deps && make metalinter && make test_integrations
   post:
     - cd "$REPO" && bash <(curl -s https://codecov.io/bash) -f coverage.txt
     - cd "$REPO" && mv coverage.txt "${CIRCLE_ARTIFACTS}"