Skip to content
This repository has been archived by the owner on Feb 16, 2021. It is now read-only.

Commit

Permalink
Internal: fix travis
Browse files Browse the repository at this point in the history
  • Loading branch information
gcanti committed Mar 15, 2018
1 parent a3f7857 commit f951909
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 17 deletions.
9 changes: 1 addition & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
language: node_js
node_js:
- "0.12"
- "9"
before_script:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
# TODO: This should be using latest for firefox. It is currently turned off because
# of https://github.com/travis-ci/travis-ci/issues/8242 When this issue is
# resolved, this should be updated back to latest
dist: trusty
sudo: false
addons:
chrome: stable
5 changes: 1 addition & 4 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@ var path = require('path') // eslint-disable-line
module.exports = function getConfig(config) {
config.set({
browserNoActivityTimeout: 30000,
// TODO: This should include "Firefox" for CI. It is currently turned off because
// of https://github.com/travis-ci/travis-ci/issues/8242 When this issue is
// resolved, this should be updated to include firefox
browsers: [process.env.CONTINUOUS_INTEGRATION ? 'Chrome' : 'Chrome'],
browsers: [process.env.CONTINUOUS_INTEGRATION ? 'Firefox' : 'Chrome'],
singleRun: true,
frameworks: ['tap'],
files: [
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@
"eslint-config-airbnb": "1.0.0",
"eslint-plugin-react": "3.10.0",
"isparta-loader": "1.0.0",
"karma": "0.13.9",
"karma-chrome-launcher": "0.2.0",
"karma-coverage": "0.5.3",
"karma-firefox-launcher": "0.1.7",
"karma-tap": "1.0.3",
"karma": "2.0.0",
"karma-chrome-launcher": "2.2.0",
"karma-coverage": "1.1.1",
"karma-firefox-launcher": "1.1.0",
"karma-tap": "3.1.1",
"karma-webpack": "1.7.0",
"react": "^15.0.0",
"react-dom": "^15.0.0",
Expand Down

0 comments on commit f951909

Please sign in to comment.