diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-05-02 11:54:09 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-05-02 11:54:09 +0200 |
| commit | af3cde98f44967a4c9f881f5abfc8b8ea329ea27 (patch) | |
| tree | 9ec50da73b9404850d759eac0e99700b0452548b /travis | |
| parent | 9cd0295dd87fd8920b473a290830b58ec3a9877e (diff) | |
| parent | 9c320ccdcec9ef3d7c1650f1bc734225321780ff (diff) | |
| download | forums-af3cde98f44967a4c9f881f5abfc8b8ea329ea27.tar forums-af3cde98f44967a4c9f881f5abfc8b8ea329ea27.tar.gz forums-af3cde98f44967a4c9f881f5abfc8b8ea329ea27.tar.bz2 forums-af3cde98f44967a4c9f881f5abfc8b8ea329ea27.tar.xz forums-af3cde98f44967a4c9f881f5abfc8b8ea329ea27.zip | |
Merge branch '3.0.x' into 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" \ |