diff options
author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-05-02 11:45:05 +0200 |
---|---|---|
committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-05-02 11:45:05 +0200 |
commit | 9c320ccdcec9ef3d7c1650f1bc734225321780ff (patch) | |
tree | ed6977ee305350167491b24ea8ef759c9ae0d549 /travis/setup-webserver.sh | |
parent | 2fb7ef26686f37a7f51367b47e9c8b0b7485d824 (diff) | |
parent | 7f820ee96204532356bb734f2df1e0bae3de1e50 (diff) | |
download | forums-9c320ccdcec9ef3d7c1650f1bc734225321780ff.tar forums-9c320ccdcec9ef3d7c1650f1bc734225321780ff.tar.gz forums-9c320ccdcec9ef3d7c1650f1bc734225321780ff.tar.bz2 forums-9c320ccdcec9ef3d7c1650f1bc734225321780ff.tar.xz forums-9c320ccdcec9ef3d7c1650f1bc734225321780ff.zip |
Merge pull request #3575 from marc1706/ticket/13792
[ticket/13792] Use hhvm instead of manually installing nightlys for now
Diffstat (limited to 'travis/setup-webserver.sh')
-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 a6086bb9f9..41210c79eb 100755 --- a/travis/setup-webserver.sh +++ b/travis/setup-webserver.sh @@ -6,12 +6,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 @@ -25,11 +19,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" \ |