chore(jenkins): fix yarn and grunt installation

This commit is contained in:
Peter Bacon Darwin
2016-12-07 10:50:24 +00:00
parent b4f5377a2f
commit fc89a85406
4 changed files with 11 additions and 9 deletions
+2 -1
View File
@@ -16,7 +16,8 @@
"scripts": {
"commit": "git-cz",
"test-i18n": "jasmine-node i18n/spec",
"test-i18n-ucd": "jasmine-node i18n/ucd/spec"
"test-i18n-ucd": "jasmine-node i18n/ucd/spec",
"grunt": "grunt"
},
"devDependencies": {
"angular-benchpress": "0.x.x",
+5 -5
View File
@@ -21,21 +21,21 @@ rm -f angular.js.size
# BUILD #
grunt ci-checks package --no-color
yarn run grunt -- ci-checks package --no-color
mkdir -p test_out
# UNIT TESTS #
grunt test:unit --browsers="$BROWSERS" --reporters=dots,junit --no-colors --no-color
yarn run grunt -- test:unit --browsers="$BROWSERS" --reporters=dots,junit --no-colors --no-color
# END TO END TESTS #
grunt test:ci-protractor
yarn run grunt -- test:ci-protractor
# DOCS APP TESTS #
grunt test:docs --browsers="$BROWSERS" --reporters=dots,junit --no-colors --no-color
yarn run grunt -- test:docs --browsers="$BROWSERS" --reporters=dots,junit --no-colors --no-color
# Promises/A+ TESTS #
grunt test:promises-aplus --no-color
yarn run grunt -- test:promises-aplus --no-color
# CHECK SIZE #
+3 -2
View File
@@ -9,9 +9,10 @@ nvm install
# clean out and install yarn
rm -rf ~/.yarn
curl -o- -L https://raw.githubusercontent.com/yarnpkg/yarn/2a0afc73210c7a82082585283e518eeb88ca19ae/scripts/install-latest.sh | bash -s -- --version 0.17.9
export PATH="$HOME/.yarn/bin:$PATH"
# Ensure we have the correct global grunt installed
yarn global add grunt-cli@1.2.0 --exact
echo testing grunt version
yarn run grunt -- --version
# Ensure that we have the local dependencies installed
yarn install
+1 -1
View File
@@ -38,7 +38,7 @@ function build {
source ./init-node.sh
cd ../..
grunt ci-checks package --no-color
yarn run grunt -- ci-checks package --no-color
cd $SCRIPT_DIR
}