diff options
| author | Vojta Jina | 2013-12-11 01:02:56 -0800 |
|---|---|---|
| committer | Vojta Jina | 2013-12-11 10:02:14 -0800 |
| commit | dc4df931778a374f1fb3c8af7545733c09b9c098 (patch) | |
| tree | f960cbbf6deaa72fc26fd0655e8ce4edc2fafc47 | |
| parent | 043190f3973bebcb93f458857fca1e42c737ab16 (diff) | |
| download | angular.js-dc4df931778a374f1fb3c8af7545733c09b9c098.tar.bz2 | |
chore(travis): run two jobs
Instead of parallelization on a single Travis VM, we use two VMs.
- output is nicer (we don't have to buffer e2e tests and then show it at the end)
- you can easily see faster the result of unit tests (as it's basically a separate build)
We should also make sure we only do the necesary stuff (for install we don't need to do `grunt
package` for unit tests, we only need to generate the docs for e2e tests.
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rwxr-xr-x | travis_build.sh | 13 |
2 files changed, 14 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 38ac9be1..3fd054aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,9 +3,13 @@ node_js: - 0.10 env: + matrix: + - JOB=unit + - JOB=e2e global: - SAUCE_USERNAME=angular-ci - SAUCE_ACCESS_KEY=9b988f434ff8-fbca-8aa4-4ae3-35442987 + # rename to BROWSER_PROVIDER_READY_FILE - SAUCE_CONNECT_READY_FILE=/tmp/sauce-connect-ready - BROWSER_STACK_USERNAME=VojtaJina - BROWSER_STACK_ACCESS_KEY=HAfHZaypxAc3PEUrUU9a @@ -21,7 +25,6 @@ before_script: - ./lib/sauce/sauce_connect_block.sh script: - - grunt ci-checks - ./travis_build.sh after_script: diff --git a/travis_build.sh b/travis_build.sh index 04845058..6467bc1a 100755 --- a/travis_build.sh +++ b/travis_build.sh @@ -4,6 +4,13 @@ set -e export SAUCE_ACCESS_KEY=`echo $SAUCE_ACCESS_KEY | rev` -grunt parallel:travis --reporters dots \ - --browsers SL_Chrome,SL_Safari,SL_Firefox,SL_IE_8,SL_IE_9,SL_IE_10,SL_IE_11 \ - --e2e-browsers SL_Chrome +if [ $JOB = "unit" ]; then + grunt ci-checks + grunt test:docgen + grunt test:promises-aplus + grunt test:unit --browsers SL_Chrome,SL_Safari,SL_Firefox,SL_IE_8,SL_IE_9,SL_IE_10,SL_IE_11 --reporters dots +elif [ $JOB = "e2e" ]; then + grunt test:e2e --browsers SL_Chrome --reporters dots +else + echo "Unknown job type. Please set JOB=unit or JOB=e2e." +fi |