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

Merge branch '3.1.x'

Conflicts:
	.travis.yml
This commit is contained in:
Marc Alexander 2015-10-14 10:42:57 +02:00
commit 9ebbf2099b
2 changed files with 4 additions and 0 deletions

View File

@ -48,3 +48,4 @@ script:
- sh -c "if [ '$NOTESTS' != '1' -a '$SLOWTESTS' != '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml; fi"
- sh -c "if [ '$SLOWTESTS' = '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml --group slow; fi"
- sh -c "set -x;if [ '$NOTESTS' = '1' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi"
- php -i | grep opcache

View File

@ -48,6 +48,9 @@ then
echo 'Enabling APC PHP extension'
register_php_extension 'apc' "$php_ini_file"
echo 'apc.enable_cli=1' >> "$php_ini_file"
else
echo 'Disabling Opcache'
echo 'opcache.enable=0' >> "$php_ini_file"
fi
# redis