From efb6b28d943046cabeec594707a4f0cacf96f215 Mon Sep 17 00:00:00 2001 From: Jon Nordby <jononor@gmail.com> Date: Mon, 29 Aug 2016 12:00:36 +0200 Subject: [PATCH 1/2] Travis: Use PhantomJS 2.x from phantomjs-prebuilt NPM package --- .travis.yml | 6 +----- package.json | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index b53b690..a5c3158 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,11 +3,7 @@ node_js: - '4.2' before_script: - npm install -g grunt-cli -- wget https://s3.amazonaws.com/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -- tar -xjf phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -- export PATH=./:$PATH -- which phantomjs -- export JSJOB_BROWSER=`which phantomjs` +- export JSJOB_BROWSER=`node -e "console.log(require('phantomjs-prebuilt').path)"` sudo: false deploy: provider: npm diff --git a/package.json b/package.json index d0f8c40..fa0380d 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,7 @@ "grunt-gh-pages": "^1.0.0", "grunt-mocha-test": "^0.12.7", "mocha": "^2.4.5", + "phantomjs-prebuilt": "^2.1.12", "webpack": "^1.12.14" }, "dependencies": { From f765dde2ba7b452feb3f9a184e59ffe7dc243eff Mon Sep 17 00:00:00 2001 From: Jon Nordby <jononor@gmail.com> Date: Mon, 29 Aug 2016 12:03:26 +0200 Subject: [PATCH 2/2] Travis: Log location of PhantomJS used --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index a5c3158..7ed9314 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ node_js: before_script: - npm install -g grunt-cli - export JSJOB_BROWSER=`node -e "console.log(require('phantomjs-prebuilt').path)"` +- echo Using PhanthomJS at $JSJOB_BROWSER sudo: false deploy: provider: npm