1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-09-09 15:50:45 +02:00

Merge branch '3.2.x'

This commit is contained in:
Marc Alexander
2017-05-25 19:38:02 +02:00
8 changed files with 336 additions and 14 deletions

View File

@@ -53,6 +53,6 @@ script:
- travis/check-executable-files.sh $DB $TRAVIS_PHP_VERSION $NOTESTS ./
- travis/check-stylesheet.sh $NOTESTS
- sh -c "if [ '$SLOWTESTS' != '1' -a '$DB' = 'mysqli' ]; then phpBB/vendor/bin/phpunit tests/lint_test.php; fi"
- sh -c "if [ '$NOTESTS' != '1' -a '$SLOWTESTS' != '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml; fi"
- sh -c "if [ '$NOTESTS' != '1' -a '$SLOWTESTS' != '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml --verbose --stop-on-error; 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"