diff --git a/scripts/check-size.sh b/scripts/check-size.sh index 327e5e170..636092ffb 100755 --- a/scripts/check-size.sh +++ b/scripts/check-size.sh @@ -1,5 +1,5 @@ #!/bin/bash -node_modules/.bin/grunt minify +grunt minify gzip -c < build/angular.min.js > build/angular.min.js.gzip ls -l build/angular.min.* diff --git a/scripts/travis/before_build.sh b/scripts/travis/before_build.sh index 0165586f6..0b3356ea3 100755 --- a/scripts/travis/before_build.sh +++ b/scripts/travis/before_build.sh @@ -2,6 +2,8 @@ set -e +yarn global add grunt-cli@1.2.0 + mkdir -p $LOGS_DIR if [ $JOB != "ci-checks" ]; then @@ -10,7 +12,7 @@ if [ $JOB != "ci-checks" ]; then fi if [ $JOB != "ci-checks" ]; then - node_modules/.bin/grunt package + grunt package echo "wait_for_browser_provider" ./scripts/travis/wait_for_browser_provider.sh fi diff --git a/scripts/travis/build.sh b/scripts/travis/build.sh index 10438875e..70dd4182f 100755 --- a/scripts/travis/build.sh +++ b/scripts/travis/build.sh @@ -6,7 +6,7 @@ export BROWSER_STACK_ACCESS_KEY=`echo $BROWSER_STACK_ACCESS_KEY | rev` export SAUCE_ACCESS_KEY=`echo $SAUCE_ACCESS_KEY | rev` if [ "$JOB" == "ci-checks" ]; then - node_modules/.bin/grunt ci-checks + grunt ci-checks elif [ "$JOB" == "unit" ]; then if [ "$BROWSER_PROVIDER" == "browserstack" ]; then BROWSERS="BS_Chrome,BS_Safari,BS_Firefox,BS_IE_9,BS_IE_10,BS_IE_11,BS_iOS" @@ -14,11 +14,11 @@ elif [ "$JOB" == "unit" ]; then BROWSERS="SL_Chrome,SL_Firefox,SL_Safari_8,SL_Safari_9,SL_IE_9,SL_IE_10,SL_IE_11,SL_iOS" fi - node_modules/.bin/grunt test:promises-aplus - node_modules/.bin/grunt test:unit --browsers="$BROWSERS" --reporters=dots - node_modules/.bin/grunt tests:docs --browsers="$BROWSERS" --reporters=dots + grunt test:promises-aplus + grunt test:unit --browsers="$BROWSERS" --reporters=dots + grunt tests:docs --browsers="$BROWSERS" --reporters=dots elif [ "$JOB" == "docs-e2e" ]; then - node_modules/.bin/grunt test:travis-protractor --specs="docs/app/e2e/**/*.scenario.js" + grunt test:travis-protractor --specs="docs/app/e2e/**/*.scenario.js" elif [ "$JOB" == "e2e" ]; then if [[ $TEST_TARGET == jquery* ]]; then export USE_JQUERY=1 @@ -30,7 +30,7 @@ elif [ "$JOB" == "e2e" ]; then fi export TARGET_SPECS="test/e2e/tests/**/*.js,$TARGET_SPECS" - node_modules/.bin/grunt test:travis-protractor --specs="$TARGET_SPECS" + grunt test:travis-protractor --specs="$TARGET_SPECS" else echo "Unknown job type. Please set JOB=ci-checks, JOB=unit or JOB=e2e-*." fi