Browse Source

tech(build): update circle ci to build using vendor folder

bergquist 9 years ago
parent
commit
4afd7a5ef1
2 changed files with 38 additions and 13 deletions
  1. 9 13
      circle.yml
  2. 29 0
      scripts/circle-test.sh

+ 9 - 13
circle.yml

@@ -5,30 +5,26 @@ machine:
     GOPATH: "/home/ubuntu/.go_workspace"
     ORG_PATH: "github.com/grafana"
     REPO_PATH: "${ORG_PATH}/grafana"
+    GODIST: "go1.6.3.linux-amd64.tar.gz"
+  post:
+    - mkdir -p download
+    - test -e download/$GODIST || curl -o download/$GODIST https://storage.googleapis.com/golang/$GODIST
+    - sudo rm -rf /usr/local/go
+    - sudo tar -C /usr/local -xzf download/$GODIST
 
 dependencies:
   override:
     - rm -rf ${GOPATH}/src/${REPO_PATH}
     - mkdir -p ${GOPATH}/src/${ORG_PATH}
-    - ln -s ~/grafana ${GOPATH}/src/${ORG_PATH}
-    - go get github.com/tools/godep
-    - rm -rf node_modules
-    - npm install -g npm
-    - npm install
+    - cp -r ~/grafana ${GOPATH}/src/${ORG_PATH}
 
 test:
   override:
-     - test -z "$(gofmt -s -l . | grep -v Godeps/_workspace/src/ | tee /dev/stderr)"
-     - go vet ./pkg/...
-     # JS tests
-     - npm test
-     - npm run coveralls
-     # GO tests
-     - godep go test -v ./pkg/...
+     - bash scripts/circle-test.sh
 
 deployment:
   master:
     branch: master
     owner: grafana
     commands:
-      - ./trigger_grafana_packer.sh ${TRIGGER_GRAFANA_PACKER_CIRCLECI_TOKEN}
+      - ./trigger_grafana_packer.sh ${TRIGGER_GRAFANA_PACKER_CIRCLECI_TOKEN}

+ 29 - 0
scripts/circle-test.sh

@@ -0,0 +1,29 @@
+#!/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
+}
+
+
+cd /home/ubuntu/.go_workspace/src/github.com/grafana/grafana
+
+rm -rf node_modules
+npm install -g npm
+npm install
+
+exit_if_fail npm test
+exit_if_fail npm run coveralls
+
+test -z "$(gofmt -s -l ./pkg/... | tee /dev/stderr)"
+
+exit_if_fail go vet ./pkg/...
+exit_if_fail go test -v ./pkg/...