From efbc2428754dc803122198b523dc7071ddc6f3cd Mon Sep 17 00:00:00 2001
From: Tobias Bosch
Date: Mon, 6 Jan 2014 15:48:30 -0800
Subject: chore(build): bugfixes to build scripts on Jenkins

---
 scripts/angular.js/publish.sh | 11 ++---------
 scripts/jenkins/master.sh     |  3 ++-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/scripts/angular.js/publish.sh b/scripts/angular.js/publish.sh
index cd728ee1..8de5b11b 100755
--- a/scripts/angular.js/publish.sh
+++ b/scripts/angular.js/publish.sh
@@ -18,19 +18,12 @@ function init {
 }
 
 function prepare() {
-
-  if ! git symbolic-ref --short HEAD; then
-    # We are on a detached branch, e.g. jenkins checks out shas instead of branches
-    # Jump onto the master branch and make sure we are using the latest
-    git checkout -f master
-    git merge --ff-only origin/master
-  fi
-
   ./scripts/angular.js/finalize-version.sh
 
   # Build
   if [[ $NO_TEST == "true" ]]; then
-    grunt package
+    npm install --color false
+    grunt ci-checks package --no-color
   else
     ./jenkins_build.sh
   fi
diff --git a/scripts/jenkins/master.sh b/scripts/jenkins/master.sh
index e27fa552..93af4d94 100755
--- a/scripts/jenkins/master.sh
+++ b/scripts/jenkins/master.sh
@@ -12,7 +12,8 @@ function build {
   cd ../..
 
   if [[ $NO_TEST == "true" ]]; then
-    grunt package
+    npm install --color false
+    grunt ci-checks package --no-color
   else
     ./jenkins_build.sh
   fi
-- 
cgit v1.2.3