diff options
| author |   Marc Alexander <admin@m-a-styles.de> | 2017-12-10 10:45:03 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-12-10 10:45:03 +0100 |
| commit | 10f1e2d1fa67aded8b424970b6b9b7ffff3aa025 (patch) | |
| tree | f25589b7781a7bb096030c58ffef554acedaf13d /.travis.yml | |
| parent | Merge pull request #4962 from rubencm/ticket/14972 (diff) | |
| parent | Merge pull request #5057 from Derky/ticket/15475 (diff) | |
| download | phpbb-10f1e2d1fa67aded8b424970b6b9b7ffff3aa025.tar.gz phpbb-10f1e2d1fa67aded8b424970b6b9b7ffff3aa025.tar.bz2 phpbb-10f1e2d1fa67aded8b424970b6b9b7ffff3aa025.zip | |
Merge branch '3.2.x'
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 347a20f9dc..90cb119e2e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,4 +57,4 @@ script: - 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 --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" + - sh -c "set -x;if [ '$NOTESTS' = '1' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git remote set-branches --add origin $TRAVIS_BRANCH && git fetch && git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..$TRAVIS_PULL_REQUEST_SHA; fi" |