From 6c225ef0d96cf65d357e8f031475da6e44538ded Mon Sep 17 00:00:00 2001 From: Jens Ulferts Date: Fri, 28 Apr 2017 11:51:04 +0200 Subject: [PATCH] phantomjs only for npm --- .travis.yml | 6 ------ script/ci_setup.sh | 8 ++++++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8a51aae709..f972205ef6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -83,12 +83,6 @@ before_install: # Install Node LTS Boron (6.9.1) - "nvm install 6.9.1" - # We need phantomjs 2.0 to get tests passing - - mkdir travis-phantomjs - - wget https://s3.amazonaws.com/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 - - tar -xvf $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -C $PWD/travis-phantomjs - - export PATH=$PWD/travis-phantomjs:$PATH - bundler_args: --binstubs --without development production docker before_script: diff --git a/script/ci_setup.sh b/script/ci_setup.sh index c26ee8a73f..6bd5d2ac1c 100644 --- a/script/ci_setup.sh +++ b/script/ci_setup.sh @@ -72,3 +72,11 @@ else run "mkdir -p app/assets/stylesheets/bundles" run "touch app/assets/javascripts/bundles/openproject-core-app.css" fi + +if [ $1 = 'npm' ]; then + # We need phantomjs 2.0 to get tests passing + run "mkdir travis-phantomjs" + run "wget https://s3.amazonaws.com/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2" + run "tar -xvf $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -C $PWD/travis-phantomjs" + run "export PATH=$PWD/travis-phantomjs:$PATH" +fi