Skip to content

Commit fc89a85

Browse files
chore(jenkins): fix yarn and grunt installation
1 parent b4f5377 commit fc89a85

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
lines changed

package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
"scripts": {
1717
"commit": "git-cz",
1818
"test-i18n": "jasmine-node i18n/spec",
19-
"test-i18n-ucd": "jasmine-node i18n/ucd/spec"
19+
"test-i18n-ucd": "jasmine-node i18n/ucd/spec",
20+
"grunt": "grunt"
2021
},
2122
"devDependencies": {
2223
"angular-benchpress": "0.x.x",

scripts/jenkins/build.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,21 @@ rm -f angular.js.size
2121

2222

2323
# BUILD #
24-
grunt ci-checks package --no-color
24+
yarn run grunt -- ci-checks package --no-color
2525

2626
mkdir -p test_out
2727

2828
# UNIT TESTS #
29-
grunt test:unit --browsers="$BROWSERS" --reporters=dots,junit --no-colors --no-color
29+
yarn run grunt -- test:unit --browsers="$BROWSERS" --reporters=dots,junit --no-colors --no-color
3030

3131
# END TO END TESTS #
32-
grunt test:ci-protractor
32+
yarn run grunt -- test:ci-protractor
3333

3434
# DOCS APP TESTS #
35-
grunt test:docs --browsers="$BROWSERS" --reporters=dots,junit --no-colors --no-color
35+
yarn run grunt -- test:docs --browsers="$BROWSERS" --reporters=dots,junit --no-colors --no-color
3636

3737
# Promises/A+ TESTS #
38-
grunt test:promises-aplus --no-color
38+
yarn run grunt -- test:promises-aplus --no-color
3939

4040

4141
# CHECK SIZE #

scripts/jenkins/init-node.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ nvm install
99
# clean out and install yarn
1010
rm -rf ~/.yarn
1111
curl -o- -L https://raw.githubusercontent.com/yarnpkg/yarn/2a0afc73210c7a82082585283e518eeb88ca19ae/scripts/install-latest.sh | bash -s -- --version 0.17.9
12+
export PATH="$HOME/.yarn/bin:$PATH"
1213

13-
# Ensure we have the correct global grunt installed
14-
yarn global add grunt[email protected] --exact
14+
echo testing grunt version
15+
yarn run grunt -- --version
1516

1617
# Ensure that we have the local dependencies installed
1718
yarn install

scripts/jenkins/release.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ function build {
3838
source ./init-node.sh
3939
cd ../..
4040

41-
grunt ci-checks package --no-color
41+
yarn run grunt -- ci-checks package --no-color
4242

4343
cd $SCRIPT_DIR
4444
}

0 commit comments

Comments
 (0)