diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-03-22 17:16:11 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-03-22 17:16:11 +0100 |
| commit | 81310f93517d50d27196b6aa1051ad3b87b5e689 (patch) | |
| tree | 9d216f7a553099c35a8969d7851691db9c539b65 | |
| parent | aef9f31325d66a4fe0b365fdde0ffbeff53a2273 (diff) | |
| parent | 1337f861235436efa3ca21ad7cd35d28849bde18 (diff) | |
| download | forums-81310f93517d50d27196b6aa1051ad3b87b5e689.tar forums-81310f93517d50d27196b6aa1051ad3b87b5e689.tar.gz forums-81310f93517d50d27196b6aa1051ad3b87b5e689.tar.bz2 forums-81310f93517d50d27196b6aa1051ad3b87b5e689.tar.xz forums-81310f93517d50d27196b6aa1051ad3b87b5e689.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[task/travis] Refactor php version check for dbunit install
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 8c07f48372..d5e1231584 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,9 +11,7 @@ before_script: - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS phpbb_tests;' -U postgres; fi" - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'create database phpbb_tests;' -U postgres; fi" - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'create database IF NOT EXISTS phpbb_tests;'; fi" - - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.2' ]; then pear install --force phpunit/DbUnit; fi" - - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.3' ]; then pyrus install --force phpunit/DbUnit; fi" - - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.4' ]; then pyrus install --force phpunit/DbUnit; fi" + - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.2' ]; then pear install --force phpunit/DbUnit; else pyrus install --force phpunit/DbUnit; fi" - phpenv rehash script: |