1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-21 00:02:18 +02:00

Merge branch '3.1.x'

This commit is contained in:
Tristan Darricau 2015-05-02 11:54:50 +02:00
commit e51571eaa3

View File

@ -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" \