Skip to content

Commit 46a83a2

Browse files
committed
Tweak travis config
Revert nyc upgrade
1 parent 569b552 commit 46a83a2

File tree

2 files changed

+15
-8
lines changed

2 files changed

+15
-8
lines changed

.travis.yml

+14-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
1+
sudo: false
12
language: node_js
23
node_js:
34
- "0.10"
45
- "0.12"
56
- "4"
6-
- "6"
7-
addons:
8-
firefox: "49.0"
9-
sudo: false
7+
8+
matrix:
9+
include:
10+
- node_js: "6"
11+
addons:
12+
firefox: "49.0"
13+
env: BROWSER=true MAKE_TEST=true
14+
env:
15+
matrix: BROWSER=false MAKE_TEST=false
16+
1017
after_success: npm run coveralls
1118

1219
# Needed to run Karma with Firefox on Travis
@@ -16,8 +23,8 @@ before_script:
1623
- sh -e /etc/init.d/xvfb start
1724

1825
script:
19-
# ensure buildable
20-
- make
2126
- npm test
27+
# ensure buildable
28+
- "[ $MAKE_TEST == false ] || make"
2229
# test in firefox
23-
- npm run mocha-browser-test
30+
- "[ $BROWSER == false ] || npm run mocha-browser-test"

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"karma-mocha-reporter": "^2.2.0",
4747
"mocha": "^3.1.2",
4848
"native-promise-only": "^0.8.0-a",
49-
"nyc": "^8.3.0",
49+
"nyc": "^7.0.0",
5050
"recursive-readdir": "^1.3.0",
5151
"rimraf": "^2.5.0",
5252
"rollup": "^0.36.3",

0 commit comments

Comments
 (0)