From 26ee0c5c2a60b15fa46eef24188ee08f2631fa26 Mon Sep 17 00:00:00 2001 From: John-David Dalton Date: Sat, 15 Oct 2016 22:36:46 -0700 Subject: [PATCH] Cleanup PhantomJS upgrade. --- .travis.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index c36b105cc..b55fb48be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,13 +41,17 @@ notifications: on_failure: always before_install: - # Upgrade PhantomJS to v2.1.1. - - export PHANTOMJS_VERSION=2.1.1 - - export PATH=$PWD/travis_phantomjs/phantomjs-$PHANTOMJS_VERSION-linux-x86_64/bin:$PATH - - if [ $(phantomjs --version) != $PHANTOMJS_VERSION ]; then rm -rf $PWD/travis_phantomjs; mkdir -p $PWD/travis_phantomjs; fi - - if [ $(phantomjs --version) != $PHANTOMJS_VERSION ]; then wget https://github.com/Medium/phantomjs/releases/download/v$PHANTOMJS_VERSION/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2 -O $PWD/travis_phantomjs/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2; fi - - if [ $(phantomjs --version) != $PHANTOMJS_VERSION ]; then tar -xvf $PWD/travis_phantomjs/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2 -C $PWD/travis_phantomjs; fi - - phantomjs -v + # Upgrade PhantomJS. + - | + export PHANTOMJS_VERSION=2.1.1 + export PATH=$PWD/travis_phantomjs/phantomjs-$PHANTOMJS_VERSION-linux-x86_64/bin:$PATH + if [ $(phantomjs --version) != $PHANTOMJS_VERSION ]; then + rm -rf $PWD/travis_phantomjs + mkdir -p $PWD/travis_phantomjs + wget https://github.com/Medium/phantomjs/releases/download/v$PHANTOMJS_VERSION/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2 + tar -xvf phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2 -C $PWD/travis_phantomjs + fi + phantomjs -v # Use exact Node version. - nvm use $TRAVIS_NODE_VERSION