Skip to content

Commit

Permalink
Merge pull request #39 from dollarshaveclub/travis-fixes
Browse files Browse the repository at this point in the history
travis fixes
  • Loading branch information
briangonzalez authored Jan 24, 2017
2 parents 0b53af1 + 39ab9d5 commit 3d0cd5b
Showing 1 changed file with 17 additions and 15 deletions.
32 changes: 17 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,7 @@ sudo: required
dist: trusty
language: node_js
node_js:
- "4"

cache:
directories:
- node_modules
- bower_components
- "6"

env:
- EMBER_TRY_SCENARIO=default
Expand All @@ -22,21 +17,28 @@ matrix:
allow_failures:
- env: EMBER_TRY_SCENARIO=ember-canary

cache:
directories:
- node_modules

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

before_install:
- export CHROME_BIN=google-chrome
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- sudo apt-get update
- sudo apt-get install -y libappindicator1 fonts-liberation
- wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
- sudo dpkg -i google-chrome*.deb
- npm config set spin false
before_install:
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
- "npm config set spin false"
- npm install -g bower
- bower --version

install:
- npm install
- bower install
- npm install

script:
# Usually, it's ok to finish the test scenario without reverting
Expand Down

0 comments on commit 3d0cd5b

Please sign in to comment.