diff options
author | 2015-10-14 10:42:57 +0200 | |
---|---|---|
committer | 2015-10-14 10:42:57 +0200 | |
commit | 9ebbf2099b79cd55e8cfd5aff0a0a008863cdcaa (patch) | |
tree | a5aa9002c80ba93c10149123af461afaa8f6e2b5 /.travis.yml | |
parent | Merge branch '3.1.x' (diff) | |
parent | Merge pull request #3973 from Nicofuma/ticket/14236 (diff) | |
download | phpbb-9ebbf2099b79cd55e8cfd5aff0a0a008863cdcaa.tar.gz phpbb-9ebbf2099b79cd55e8cfd5aff0a0a008863cdcaa.tar.bz2 phpbb-9ebbf2099b79cd55e8cfd5aff0a0a008863cdcaa.zip |
Merge branch '3.1.x'
Conflicts:
.travis.yml
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 1 |
1 files changed, 1 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 |