aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml4
-rwxr-xr-xtravis/setup-phpbb.sh2
2 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 051e25aa08..3d79d156de 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,13 +14,13 @@ services:
- redis-server
install:
- - travis/install-setup-phpbb.sh $DB $TRAVIS_PHP_VERSION
+ - travis/setup-phpbb.sh $DB $TRAVIS_PHP_VERSION
before_script:
- travis/setup-database.sh $DB $TRAVIS_PHP_VERSION
script:
- - travis/phing-code-sniff.sh $DB $TRAVIS_PHP_VERSION
+ - travis/phing-sniff.sh $DB $TRAVIS_PHP_VERSION
- phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml
- sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.5' -a '$DB' = 'mysql' -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.sh b/travis/setup-phpbb.sh
index 8a8bde373c..74be5367e5 100755
--- a/travis/setup-phpbb.sh
+++ b/travis/setup-phpbb.sh
@@ -16,7 +16,7 @@ fi
if [ "$TRAVIS_PHP_VERSION" == "hhvm" ]
then
- travis/setup-php-extensions.sh
+ stravis/setup-php-extensions.sh
fi
if [ `php -r "echo (int) version_compare(PHP_VERSION, '5.3.19', '>=');"` == "1" ]