[ticket/12470] Fix setup of phpbb

PHPBB3-12470
This commit is contained in:
Joas Schilling 2014-05-02 19:29:30 +02:00
parent a2ac425688
commit 994ab684bc
2 changed files with 3 additions and 3 deletions

View file

@ -14,13 +14,13 @@ services:
- redis-server - redis-server
install: install:
- travis/install-setup-phpbb.sh $DB $TRAVIS_PHP_VERSION - travis/setup-phpbb.sh $DB $TRAVIS_PHP_VERSION
before_script: before_script:
- travis/setup-database.sh $DB $TRAVIS_PHP_VERSION - travis/setup-database.sh $DB $TRAVIS_PHP_VERSION
script: 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 - 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" - 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"

View file

@ -16,7 +16,7 @@ fi
if [ "$TRAVIS_PHP_VERSION" == "hhvm" ] if [ "$TRAVIS_PHP_VERSION" == "hhvm" ]
then then
travis/setup-php-extensions.sh stravis/setup-php-extensions.sh
fi fi
if [ `php -r "echo (int) version_compare(PHP_VERSION, '5.3.19', '>=');"` == "1" ] if [ `php -r "echo (int) version_compare(PHP_VERSION, '5.3.19', '>=');"` == "1" ]