makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.1.x'

Browse source
This commit is contained in:
Tristan Darricau 2015-05-02 11:54:50 +02:00
commit e51571eaa3
1 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
travis/setup-webserver.sh
View file

@ -11,12 +11,6 @@
set -e set -e
set -x 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 update
sudo apt-get install -y nginx realpath sudo apt-get install -y nginx realpath
@ -30,11 +24,9 @@ APP_SOCK=$(realpath "$DIR")/php-app.sock
if [ "$TRAVIS_PHP_VERSION" = 'hhvm' ] if [ "$TRAVIS_PHP_VERSION" = 'hhvm' ]
then 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 HHVM_LOG=$(realpath "$DIR")/hhvm.log
sudo service hhvm stop
sudo hhvm \ sudo hhvm \
--mode daemon \ --mode daemon \
--user "$USER" \ --user "$USER" \