chore(jenkins): run Jenkins builds on Node 4 (via nvm)

petebacondarwin · petebacondarwin · commit 0e729e1dd506 · 2015-12-17T14:07:03.000Z
Closes angular#13568
diff --git a/scripts/jenkins/build.sh b/scripts/jenkins/build.sh
@@ -7,6 +7,8 @@ echo "#################################"
 # Enable tracing and exit on first failure
 set -xe
 
+scripts/jenkins/set-node-version.sh
+
 # This is the default set of browsers to use on the CI server unless overridden via env variable
 if [[ -z "$BROWSERS" ]]
 then
@@ -19,6 +21,7 @@ rm -f angular.js.size
 
 
 # BUILD #
+npm install -g grunt-cli
 npm install --color false
 grunt ci-checks package --no-color
 
diff --git a/scripts/jenkins/master.sh b/scripts/jenkins/master.sh
@@ -17,14 +17,7 @@ function init {
 
 function build {
   cd ../..
-
-  if [[ $NO_TEST == "true" ]]; then
-    npm install --color false
-    grunt ci-checks package --no-color
-  else
-    scripts/jenkins/build.sh
-  fi
-
+  scripts/jenkins/build.sh
   cd $SCRIPT_DIR
 }
 
diff --git a/scripts/jenkins/release.sh b/scripts/jenkins/release.sh
@@ -35,8 +35,10 @@ function init {
 }
 
 function build {
+  ./set-node-version.sh
   cd ../..
 
+  npm install -g grunt-cli
   npm install --color false
   grunt ci-checks package --no-color
 
diff --git a/scripts/jenkins/set-node-version.sh b/scripts/jenkins/set-node-version.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# Install nvm for this shell
+source ~/.nvm/nvm.sh
+
+# Use node.js at 4.2.x
+nvm install 4.2

Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,10 @@ function init {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`function build {`
	`38`	`+ ./set-node-version.sh`
`38`	`39`	`cd ../..`
`39`	`40`
	`41`	`+ npm install -g grunt-cli`
`40`	`42`	`npm install --color false`
`41`	`43`	`grunt ci-checks package --no-color`
`42`	`44`