Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Commit dc4df93

Browse files
committed
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.
1 parent 043190f commit dc4df93

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

.travis.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,13 @@ node_js:
33
- 0.10
44

55
env:
6+
matrix:
7+
- JOB=unit
8+
- JOB=e2e
69
global:
710
- SAUCE_USERNAME=angular-ci
811
- SAUCE_ACCESS_KEY=9b988f434ff8-fbca-8aa4-4ae3-35442987
12+
# rename to BROWSER_PROVIDER_READY_FILE
913
- SAUCE_CONNECT_READY_FILE=/tmp/sauce-connect-ready
1014
- BROWSER_STACK_USERNAME=VojtaJina
1115
- BROWSER_STACK_ACCESS_KEY=HAfHZaypxAc3PEUrUU9a
@@ -21,7 +25,6 @@ before_script:
2125
- ./lib/sauce/sauce_connect_block.sh
2226

2327
script:
24-
- grunt ci-checks
2528
- ./travis_build.sh
2629

2730
after_script:

travis_build.sh

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@ set -e
44

55
export SAUCE_ACCESS_KEY=`echo $SAUCE_ACCESS_KEY | rev`
66

7-
grunt parallel:travis --reporters dots \
8-
--browsers SL_Chrome,SL_Safari,SL_Firefox,SL_IE_8,SL_IE_9,SL_IE_10,SL_IE_11 \
9-
--e2e-browsers SL_Chrome
7+
if [ $JOB = "unit" ]; then
8+
grunt ci-checks
9+
grunt test:docgen
10+
grunt test:promises-aplus
11+
grunt test:unit --browsers SL_Chrome,SL_Safari,SL_Firefox,SL_IE_8,SL_IE_9,SL_IE_10,SL_IE_11 --reporters dots
12+
elif [ $JOB = "e2e" ]; then
13+
grunt test:e2e --browsers SL_Chrome --reporters dots
14+
else
15+
echo "Unknown job type. Please set JOB=unit or JOB=e2e."
16+
fi

0 commit comments

Comments
 (0)