diff options
| author |   Marc Alexander <admin@m-a-styles.de> | 2015-05-01 15:41:08 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-05-01 15:45:40 +0200 |
| commit | 7f820ee96204532356bb734f2df1e0bae3de1e50 (patch) | |
| tree | ed6977ee305350167491b24ea8ef759c9ae0d549 /travis | |
| parent | Merge branch 'prep-release-3.0.14' into 3.0.x (diff) | |
| download | phpbb-7f820ee96204532356bb734f2df1e0bae3de1e50.tar.gz phpbb-7f820ee96204532356bb734f2df1e0bae3de1e50.tar.bz2 phpbb-7f820ee96204532356bb734f2df1e0bae3de1e50.zip | |
[ticket/13792] Use hhvm instead of manually installing nightlys for now
Nightly builds are currently not supported because packages for precise
no longer exist and travis is still running on it.
PHPBB3-13792
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 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" \ |