mirror of
https://github.com/Hopiu/angular.js.git
synced 2026-03-16 23:30:23 +00:00
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.
This commit is contained in:
parent
043190f397
commit
dc4df93177
2 changed files with 14 additions and 4 deletions
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue