From d5e49845f3555b7ef47ebdc1ec17101a8b4b74dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Mon, 21 Jan 2019 13:02:30 +0100
Subject: [PATCH 1/4] Moved gometalinter to a script instead of seperate
 commands in circleci file, removed megacheck and added staticcheck

---
 .circleci/config.yml          | 15 ++-------------
 scripts/build/gometalinter.sh | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 13 deletions(-)
 create mode 100755 scripts/build/gometalinter.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 876db1d4823..008d2faf57c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -81,20 +81,9 @@ jobs:
     working_directory: /go/src/github.com/grafana/grafana
     steps:
       - checkout
-      - run: 'go get -u github.com/alecthomas/gometalinter'
-      - run: 'go get -u github.com/tsenart/deadcode'
-      - run: 'go get -u github.com/jgautheron/goconst/cmd/goconst'
-      - run: 'go get -u github.com/gordonklaus/ineffassign'
-      - run: 'go get -u honnef.co/go/tools/cmd/megacheck'
-      - run: 'go get -u github.com/opennota/check/cmd/structcheck'
-      - run: 'go get -u github.com/mdempsky/unconvert'
-      - run: 'go get -u github.com/opennota/check/cmd/varcheck'
       - run:
-          name: run linters
-          command: 'gometalinter --enable-gc --vendor --deadline 10m --disable-all --enable=deadcode --enable=goconst --enable=gofmt --enable=ineffassign --enable=megacheck --enable=structcheck --enable=unconvert --enable=varcheck ./...'
-      - run:
-          name: run go vet
-          command: 'go vet ./pkg/...'
+          name: frontend tests
+          command: './scripts/build/gometalinter.sh'
 
   test-frontend:
     docker:
diff --git a/scripts/build/gometalinter.sh b/scripts/build/gometalinter.sh
new file mode 100755
index 00000000000..9c77220991f
--- /dev/null
+++ b/scripts/build/gometalinter.sh
@@ -0,0 +1,22 @@
+#!/bin/bash -e
+
+go get -u github.com/alecthomas/gometalinter
+go get -u github.com/tsenart/deadcode
+go get -u github.com/jgautheron/goconst/cmd/goconst
+go get -u github.com/gordonklaus/ineffassign
+go get -u github.com/opennota/check/cmd/structcheck
+go get -u github.com/mdempsky/unconvert
+go get -u github.com/opennota/check/cmd/varcheck
+go get -u honnef.co/go/tools/cmd/staticcheck
+
+gometalinter --enable-gc --vendor --deadline 10m --disable-all \
+  --enable=deadcode \
+  --enable=goconst \
+  --enable=gofmt \
+  --enable=ineffassign \
+  --enable=structcheck \
+  --enable=unconvert \
+  --enable=varcheck \
+  --enable=staticcheck
+
+go vet ./pkg/...

From 37e917939a217b5623934de0949779a0f6f333f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Mon, 21 Jan 2019 13:07:28 +0100
Subject: [PATCH 2/4] moved script and added exit_if_fail

---
 scripts/{build => }/gometalinter.sh | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)
 rename scripts/{build => }/gometalinter.sh (63%)

diff --git a/scripts/build/gometalinter.sh b/scripts/gometalinter.sh
similarity index 63%
rename from scripts/build/gometalinter.sh
rename to scripts/gometalinter.sh
index 9c77220991f..b360b7f1222 100755
--- a/scripts/build/gometalinter.sh
+++ b/scripts/gometalinter.sh
@@ -1,4 +1,15 @@
-#!/bin/bash -e
+#!/bin/bash
+
+function exit_if_fail {
+    command=$@
+    echo "Executing '$command'"
+    eval $command
+    rc=$?
+    if [ $rc -ne 0 ]; then
+        echo "'$command' returned $rc."
+        exit $rc
+    fi
+}
 
 go get -u github.com/alecthomas/gometalinter
 go get -u github.com/tsenart/deadcode
@@ -9,7 +20,7 @@ go get -u github.com/mdempsky/unconvert
 go get -u github.com/opennota/check/cmd/varcheck
 go get -u honnef.co/go/tools/cmd/staticcheck
 
-gometalinter --enable-gc --vendor --deadline 10m --disable-all \
+exit_if_fail gometalinter --enable-gc --vendor --deadline 10m --disable-all \
   --enable=deadcode \
   --enable=goconst \
   --enable=gofmt \
@@ -19,4 +30,4 @@ gometalinter --enable-gc --vendor --deadline 10m --disable-all \
   --enable=varcheck \
   --enable=staticcheck
 
-go vet ./pkg/...
+exit_if_fail go vet ./pkg/...

From f24e6ebf676b2687719e09450a25aa491342bc6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Mon, 21 Jan 2019 13:10:00 +0100
Subject: [PATCH 3/4] Fixed circleci name for gometalinter exec step

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 008d2faf57c..a7f601114f5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -82,7 +82,7 @@ jobs:
     steps:
       - checkout
       - run:
-          name: frontend tests
+          name: Gometalinter tests
           command: './scripts/build/gometalinter.sh'
 
   test-frontend:

From 829e3024ce15fb27eac267940039f650d4ff4362 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Mon, 21 Jan 2019 13:20:24 +0100
Subject: [PATCH 4/4] fixed circleci script run path for gometalinter

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a7f601114f5..f6d66daab84 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -83,7 +83,7 @@ jobs:
       - checkout
       - run:
           name: Gometalinter tests
-          command: './scripts/build/gometalinter.sh'
+          command: './scripts/gometalinter.sh'
 
   test-frontend:
     docker: