diff options
| author | Graeme Yeates <yeatesgraeme@gmail.com> | 2016-10-15 21:55:16 -0400 |
|---|---|---|
| committer | Graeme Yeates <yeatesgraeme@gmail.com> | 2016-10-16 13:56:10 -0400 |
| commit | 46a83a2c828f55ee2c5c54096d352f730fbcd13b (patch) | |
| tree | 2c85c94b08e902e7cf07775f2da05899a9a8fb33 | |
| parent | 569b552b61cb58f4b59014c5dea828958f3752b7 (diff) | |
| download | async-update-dependencies.tar.gz | |
Tweak travis configupdate-dependencies
Revert nyc upgrade
| -rw-r--r-- | .travis.yml | 21 | ||||
| -rw-r--r-- | package.json | 2 |
2 files changed, 15 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 6cdb549..ff46739 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,19 @@ +sudo: false language: node_js node_js: - "0.10" - "0.12" - "4" - - "6" -addons: - firefox: "49.0" -sudo: false + +matrix: + include: + - node_js: "6" + addons: + firefox: "49.0" + env: BROWSER=true MAKE_TEST=true +env: + matrix: BROWSER=false MAKE_TEST=false + after_success: npm run coveralls # Needed to run Karma with Firefox on Travis @@ -16,8 +23,8 @@ before_script: - sh -e /etc/init.d/xvfb start script: - # ensure buildable - - make - npm test + # ensure buildable + - "[ $MAKE_TEST == false ] || make" # test in firefox - - npm run mocha-browser-test
\ No newline at end of file + - "[ $BROWSER == false ] || npm run mocha-browser-test"
\ No newline at end of file diff --git a/package.json b/package.json index 0341ac8..e00e034 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "karma-mocha-reporter": "^2.2.0", "mocha": "^3.1.2", "native-promise-only": "^0.8.0-a", - "nyc": "^8.3.0", + "nyc": "^7.0.0", "recursive-readdir": "^1.3.0", "rimraf": "^2.5.0", "rollup": "^0.36.3", |