diff options
author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-02 19:29:30 +0200 |
---|---|---|
committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-03 10:43:40 +0200 |
commit | 994ab684bcd0de29aa9e31775631f1022660bf4d (patch) | |
tree | a778e3f9b83407fec8cebceea5b12b3cda5471dc | |
parent | a2ac425688fdd6f5b6bd9c51a24d1a9c261e2033 (diff) | |
download | forums-994ab684bcd0de29aa9e31775631f1022660bf4d.tar forums-994ab684bcd0de29aa9e31775631f1022660bf4d.tar.gz forums-994ab684bcd0de29aa9e31775631f1022660bf4d.tar.bz2 forums-994ab684bcd0de29aa9e31775631f1022660bf4d.tar.xz forums-994ab684bcd0de29aa9e31775631f1022660bf4d.zip |
[ticket/12470] Fix setup of phpbb
PHPBB3-12470
-rw-r--r-- | .travis.yml | 4 | ||||
-rwxr-xr-x | travis/setup-phpbb.sh | 2 |
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" ] |