From 2c9697ff4e9723688293e73c98b1d2d79f8c36aa Mon Sep 17 00:00:00 2001 From: Rob Harrington Date: Wed, 11 May 2016 14:30:41 +1000 Subject: [PATCH] Adding -nc option to wget of PhantomJS, so that we only download it if needed --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 04e7100f44..f914edbbb6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,15 +26,15 @@ env: - CI_NODE_INDEX=4 KARMA="true" GITHUB_DEPLOY="true" before_script: - - mkdir travis-phantomjs || true - - wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 - - tar -xvf $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis-phantomjs - - export PATH=$PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH - - cp config/database.travis.yml config/database.yml - cp config/application.yml.example config/application.yml - RAILS_ENV=test bundle exec rake db:create db:schema:load + - mkdir -p travis-phantomjs + - wget -nc https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 || true + - tar -xvf $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis-phantomjs + - export PATH=$PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH + - > if [ "$KARMA" = "true" ]; then npm install -g npm@'3.8.8'