From ce656f7a361f63522e7e02cfa1bd0ea305b2bf71 Mon Sep 17 00:00:00 2001 From: soulgalore Date: Sat, 11 Jul 2015 00:57:49 +0200 Subject: [PATCH] rollback new travis for now --- .travis.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index edae00bfb..5d9cc6fdf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,19 +1,17 @@ language: node_js -sudo: false node_js: - '0.10' - '0.12' before_install: -- 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 +- 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 +- sudo rm -rf /usr/local/phantomjs/bin/phantomjs +- sudo mv phantomjs /usr/local/phantomjs/bin/phantomjs - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start before_script: - cat /etc/hosts - phantomjs --version -#- $PWD/phantomjs-2.0.0-ubuntu-12.04/bin/phantomjs --version - python -m SimpleHTTPServer 8009 & - sleep 10 script: @@ -24,7 +22,7 @@ script: - node ./bin/sitespeed.js -u http://www.sitespeed.io -b firefox -n 1 --noYslow -m 3 --screenshot - node ./bin/sitespeed.js -u http://www.sitespeed.io -n 2 -d 0 --gpsiKey $GKEY --wptKey $WPTKEY --wptHost www.webpagetest.org - node ./bin/sitespeed.js -u http://127.0.0.1:8009/test/resources//server/www/ -d 0 --junit -- node ./bin/sitespeed.js -u http://www.sitespeed.io -b headless -n 1 -m 2 --phantomjsPath $PWD/travis-phantomjs/bin/phantomjs +- node ./bin/sitespeed.js -u http://www.sitespeed.io -b headless -n 1 -m 2 --phantomjsPath /usr/local/phantomjs/bin/phantomjs - node ./bin/sitespeed.js -u http://www.sitespeed.io -b headless -n 1 --headless slimerjs -d 0 --noYslow after_script: - kill `ps aux | grep "python -m SimpleHTTPServer" | grep -v grep | awk '{print $2}'`