diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-05-02 11:54:50 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-05-02 11:54:50 +0200 |
| commit | e51571eaa3b52a5a344cc847b51049c67642f6ff (patch) | |
| tree | 119514d34454bb3d650bdcb231a16c69d49237c9 /travis | |
| parent | d67fdfa02bdeb80978ef1440af55ca710552b5ad (diff) | |
| parent | af3cde98f44967a4c9f881f5abfc8b8ea329ea27 (diff) | |
| download | forums-e51571eaa3b52a5a344cc847b51049c67642f6ff.tar forums-e51571eaa3b52a5a344cc847b51049c67642f6ff.tar.gz forums-e51571eaa3b52a5a344cc847b51049c67642f6ff.tar.bz2 forums-e51571eaa3b52a5a344cc847b51049c67642f6ff.tar.xz forums-e51571eaa3b52a5a344cc847b51049c67642f6ff.zip | |
Merge branch '3.1.x'
Diffstat (limited to 'travis')
| -rwxr-xr-x | travis/setup-webserver.sh | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/travis/setup-webserver.sh b/travis/setup-webserver.sh index ab045431cc..911ba12f3c 100755 --- a/travis/setup-webserver.sh +++ b/travis/setup-webserver.sh @@ -11,12 +11,6 @@ set -e set -x -if [ "$TRAVIS_PHP_VERSION" = 'hhvm' ] -then - # Add PPA providing dependencies for recent HHVM on Ubuntu 12.04. - sudo add-apt-repository -y ppa:mapnik/boost -fi - sudo apt-get update sudo apt-get install -y nginx realpath @@ -30,11 +24,9 @@ APP_SOCK=$(realpath "$DIR")/php-app.sock if [ "$TRAVIS_PHP_VERSION" = 'hhvm' ] then - # Upgrade to a recent stable version of HHVM - sudo apt-get -o Dpkg::Options::="--force-confnew" install -y hhvm-nightly - HHVM_LOG=$(realpath "$DIR")/hhvm.log + sudo service hhvm stop sudo hhvm \ --mode daemon \ --user "$USER" \ |