diff options
author | Marc Alexander <admin@m-a-styles.de> | 2015-10-14 10:42:57 +0200 |
---|---|---|
committer | Marc Alexander <admin@m-a-styles.de> | 2015-10-14 10:42:57 +0200 |
commit | 9ebbf2099b79cd55e8cfd5aff0a0a008863cdcaa (patch) | |
tree | a5aa9002c80ba93c10149123af461afaa8f6e2b5 | |
parent | e0fb680dbb46f17a48071745c72b0282aa3a1d93 (diff) | |
parent | ccb3d0ac78db25f60983e1c3211f0220cbee93f8 (diff) | |
download | forums-9ebbf2099b79cd55e8cfd5aff0a0a008863cdcaa.tar forums-9ebbf2099b79cd55e8cfd5aff0a0a008863cdcaa.tar.gz forums-9ebbf2099b79cd55e8cfd5aff0a0a008863cdcaa.tar.bz2 forums-9ebbf2099b79cd55e8cfd5aff0a0a008863cdcaa.tar.xz forums-9ebbf2099b79cd55e8cfd5aff0a0a008863cdcaa.zip |
Merge branch '3.1.x'
Conflicts:
.travis.yml
-rw-r--r-- | .travis.yml | 1 | ||||
-rwxr-xr-x | travis/setup-php-extensions.sh | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 4f9734a19a..88b5610d20 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/travis/setup-php-extensions.sh b/travis/setup-php-extensions.sh index c0defe44ef..d9544858b7 100755 --- a/travis/setup-php-extensions.sh +++ b/travis/setup-php-extensions.sh @@ -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 |