Skip to content

Commit 9e10ce7

Browse files
do CI against two copies of ui-router-core:
- Test against current ui-router-core/master - Test against ui-router-core dep from package.json - CI passes if `master` passes
1 parent 2c36388 commit 9e10ce7

File tree

2 files changed

+22
-2
lines changed

2 files changed

+22
-2
lines changed

.travis.yml

+21-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,30 @@ before_script:
66
- export DISPLAY=:99.0
77
- sh -e /etc/init.d/xvfb start
88
- npm install -g karma
9-
- npm install -g grunt-cli
9+
- npm install -g typescript
1010
- ./nodeserver.sh > /dev/null &
1111

12+
matrix:
13+
allow_failures:
14+
- env: CORE_BRANCH=
15+
16+
env:
17+
matrix:
18+
# CORE_BRANCH env variable specifies the branch of ui-router-core to use during build/test
19+
# Each CORE_BRANCH listed here will trigger a SEPARATE job in travis
20+
- CORE_BRANCH=master
21+
22+
# If CORE_BRANCH is empty, it will use the ui-router-core from npm dependencies
23+
# (as specified in package.json)
24+
- CORE_BRANCH=
25+
1226
script:
13-
- npm run test:integrate
27+
- echo "CORE_BRANCH = x${CORE_BRANCH}x";
28+
- >
29+
if [ "x${CORE_BRANCH}x" != "xx" ] ; then
30+
git clone --depth=10 --branch="${CORE_BRANCH}" https://github.com/ui-router/core.git ui-router-core && npm install ./ui-router-core ;
31+
fi
32+
- npm test
1433

1534
sudo: false
1635

package.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
23
"name": "ui-router",
34
"description": "State-based routing for Javascript",
45
"version": "1.0.0-beta.4",

0 commit comments

Comments
 (0)