Skip to content

Commit 10fb103

Browse files
fix(travis): npm install when fetching ui-router-core from github. use es5 in karma.conf.js
1 parent ff6d13b commit 10fb103

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

.travis.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ before_script:
77
- sh -e /etc/init.d/xvfb start
88
- npm install -g karma
99
- npm install -g typescript
10+
- npm install -g yarn
1011
- ./nodeserver.sh > /dev/null &
1112

1213
matrix:
@@ -27,7 +28,7 @@ script:
2728
- echo "CORE_BRANCH = x${CORE_BRANCH}x";
2829
- >
2930
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+
git clone --depth=10 --branch="${CORE_BRANCH}" https://github.com/ui-router/core.git ui-router-core && pushd ui-router-core && yarn && popd && npm install ./ui-router-core ;
3132
fi
3233
- npm test
3334

karma.conf.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ function karmaServedFiles(ngVersion) {
2323
];
2424
}
2525

26-
let angularFiles = angular(ngVersion).map(function (pattern) {
26+
var angularFiles = angular(ngVersion).map(function (pattern) {
2727
return { watched: false, included: true, nocache: true, pattern: pattern };
2828
});
2929

30-
let srcFiles = [
30+
var srcFiles = [
3131
{ watched: true, included: false, nocache: true, pattern: 'src/**/*.ts' },
3232
];
3333

34-
let testFiles = [
34+
var testFiles = [
3535
{ watched: true, included: false, nocache: true, pattern: 'test/**/*.ts' },
3636
{ watched: true, included: false, nocache: true, pattern: 'test/**/*.js' }
3737
];

0 commit comments

Comments
 (0)