diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-03-22 17:15:52 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-03-22 17:15:52 +0100 |
| commit | 1337f861235436efa3ca21ad7cd35d28849bde18 (patch) | |
| tree | 417c0ea4045f977442a1ab9faa3605bfa554b4a5 | |
| parent | 992b58d4685dabf04636d80fd5aa09f6ff10ed45 (diff) | |
| parent | 841d11c6cd90d331c2923ba7851dd5f813203ddf (diff) | |
| download | forums-1337f861235436efa3ca21ad7cd35d28849bde18.tar forums-1337f861235436efa3ca21ad7cd35d28849bde18.tar.gz forums-1337f861235436efa3ca21ad7cd35d28849bde18.tar.bz2 forums-1337f861235436efa3ca21ad7cd35d28849bde18.tar.xz forums-1337f861235436efa3ca21ad7cd35d28849bde18.zip | |
Merge remote-tracking branch 'github-unknownbliss/task/travis' into develop-olympus
* github-unknownbliss/task/travis:
[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 78221d588c..d73bbd2a48 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,9 +12,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: |