Skip to content

Commit

Permalink
fixes CI config
Browse files Browse the repository at this point in the history
  • Loading branch information
zigahertz committed Jul 5, 2016
1 parent 9d10bf8 commit 8e182a7
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 18 deletions.
18 changes: 13 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,15 @@ language: node_js
node_js:
- "4"

sudo: false
sudo: required
dist: trusty

addons:
apt:
sources:
- google-chrome
packages:
- google-chrome-stable

cache:
directories:
Expand All @@ -22,13 +30,13 @@ matrix:
- env: EMBER_TRY_SCENARIO=ember-canary

before_install:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- npm config set spin false
- npm install -g bower
- bower --version
- npm install phantomjs-prebuilt
- phantomjs --version
- npm install -g npm@^2

install:
- npm install -g bower
- npm install
- bower install

Expand Down
3 changes: 1 addition & 2 deletions testem.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@ module.exports = {
"test_page": "tests/index.html?hidepassed",
"disable_watching": true,
"launch_in_ci": [
"PhantomJS"
"Chrome"
],
"launch_in_dev": [
"PhantomJS",
"Chrome"
]
};
11 changes: 0 additions & 11 deletions testem.json

This file was deleted.

0 comments on commit 8e182a7

Please sign in to comment.