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

Merge branch '3.2.x'

Browse source
This commit is contained in:
Marc Alexander 2018-01-11 21:33:23 +01:00
commit 4bf3290c23
3 changed files with 17 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.travis.yml
View file

@ -26,11 +26,8 @@ matrix:
env: DB=mysqli env: DB=mysqli
- php: nightly - php: nightly
env: DB=mysqli env: DB=mysqli
- php: hhvm
env: DB=mysqli
allow_failures: allow_failures:
- php: nightly - php: nightly
- php: hhvm
fast_finish: true fast_finish: true
addons: addons:

2
travis/setup-phpbb.sh
View file

@ -26,7 +26,7 @@ then
travis/setup-mariadb.sh travis/setup-mariadb.sh
fi fi
if [ "$NOTESTS" != '1' -a "$TRAVIS_PHP_VERSION" != "hhvm" ] if [ "$NOTESTS" != '1' ]
then then
travis/setup-php-extensions.sh travis/setup-php-extensions.sh
fi fi

13
travis/setup-webserver.sh
View file

@ -22,18 +22,6 @@ PHPBB_ROOT_PATH=$(realpath "$DIR/../phpBB")
NGINX_CONF="/etc/nginx/sites-enabled/default" NGINX_CONF="/etc/nginx/sites-enabled/default"
APP_SOCK=$(realpath "$DIR")/php-app.sock APP_SOCK=$(realpath "$DIR")/php-app.sock
if [ "$TRAVIS_PHP_VERSION" = 'hhvm' ]
then
HHVM_LOG=$(realpath "$DIR")/hhvm.log
sudo service hhvm stop
sudo hhvm \
--mode daemon \
--user "$USER" \
-vServer.Type=fastcgi \
-vServer.FileSocket="$APP_SOCK" \
-vLog.File="$HHVM_LOG"
else
# php-fpm # php-fpm
PHP_FPM_BIN="$HOME/.phpenv/versions/$TRAVIS_PHP_VERSION/sbin/php-fpm" PHP_FPM_BIN="$HOME/.phpenv/versions/$TRAVIS_PHP_VERSION/sbin/php-fpm"
PHP_FPM_CONF="$DIR/php-fpm.conf" PHP_FPM_CONF="$DIR/php-fpm.conf"
@ -54,7 +42,6 @@ else
sudo $PHP_FPM_BIN \ sudo $PHP_FPM_BIN \
--fpm-config "$DIR/php-fpm.conf" --fpm-config "$DIR/php-fpm.conf"
fi
# nginx # nginx
cat $DIR/../phpBB/docs/nginx.sample.conf \ cat $DIR/../phpBB/docs/nginx.sample.conf \