Skip to content

Commit 0e729e1

Browse files
chore(jenkins): run Jenkins builds on Node 4 (via nvm)
Closes angular#13568
1 parent 9bb184d commit 0e729e1

File tree

4 files changed

+13
-8
lines changed

4 files changed

+13
-8
lines changed

scripts/jenkins/build.sh

+3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ echo "#################################"
77
# Enable tracing and exit on first failure
88
set -xe
99

10+
scripts/jenkins/set-node-version.sh
11+
1012
# This is the default set of browsers to use on the CI server unless overridden via env variable
1113
if [[ -z "$BROWSERS" ]]
1214
then
@@ -19,6 +21,7 @@ rm -f angular.js.size
1921

2022

2123
# BUILD #
24+
npm install -g grunt-cli
2225
npm install --color false
2326
grunt ci-checks package --no-color
2427

scripts/jenkins/master.sh

+1-8
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,7 @@ function init {
1717

1818
function build {
1919
cd ../..
20-
21-
if [[ $NO_TEST == "true" ]]; then
22-
npm install --color false
23-
grunt ci-checks package --no-color
24-
else
25-
scripts/jenkins/build.sh
26-
fi
27-
20+
scripts/jenkins/build.sh
2821
cd $SCRIPT_DIR
2922
}
3023

scripts/jenkins/release.sh

+2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,10 @@ function init {
3535
}
3636

3737
function build {
38+
./set-node-version.sh
3839
cd ../..
3940

41+
npm install -g grunt-cli
4042
npm install --color false
4143
grunt ci-checks package --no-color
4244

scripts/jenkins/set-node-version.sh

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
3+
# Install nvm for this shell
4+
source ~/.nvm/nvm.sh
5+
6+
# Use node.js at 4.2.x
7+
nvm install 4.2

0 commit comments

Comments
 (0)