diff options
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rwxr-xr-x | travis/install-phpbb-test-dependencies.sh (renamed from travis/setup-phpbb-test.sh) | 0 | ||||
| -rwxr-xr-x | travis/setup-phpbb.sh | 2 |
3 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 1eb7c56236..2e0b68c3de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,3 +43,4 @@ script: - travis/check-executable-files.sh $DB $TRAVIS_PHP_VERSION ./ - phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.3.3' -a '$DB' = 'mysqli' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi" + diff --git a/travis/setup-phpbb-test.sh b/travis/install-phpbb-test-dependencies.sh index 25743ff2b1..25743ff2b1 100755 --- a/travis/setup-phpbb-test.sh +++ b/travis/install-phpbb-test-dependencies.sh diff --git a/travis/setup-phpbb.sh b/travis/setup-phpbb.sh index e91b6f3624..205f23b876 100755 --- a/travis/setup-phpbb.sh +++ b/travis/setup-phpbb.sh @@ -33,7 +33,7 @@ fi if [ `php -r "echo (int) version_compare(PHP_VERSION, '5.3.19', '>=');"` == "1" ] then travis/setup-webserver.sh - travis/setup-phpbb-test.sh + travis/install-phpbb-test-dependencies.sh fi cd phpBB |