diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-06-07 21:25:16 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-06-07 21:25:16 +0200 |
| commit | 27af930d4ed1daf9f2710b005d103c7f1c7d919d (patch) | |
| tree | ffe257a549ae70749dcf4646695a0d73535e237e /.travis.yml | |
| parent | 87ac4260063e3a62805cc8f6f73cd2eb18da663a (diff) | |
| parent | 928b9aa6340654b1dbb69af44c41468456f0b7b6 (diff) | |
Merge upstream branch
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 97ea0422d..31b74b13b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,16 +13,14 @@ env: - DB=pdo/sqlite before_script: - - pyrus channel-discover pear.php-tools.net - - pyrus install http://pear.php-tools.net/get/vfsStream-0.11.2.tgz - - phpenv rehash + - curl -s http://getcomposer.org/installer | php + - php composer.phar install - sh -c "if [ '$DB' = 'pgsql' ] || [ '$DB' = 'pdo/pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS ci_test;' -U postgres; fi" - sh -c "if [ '$DB' = 'pgsql' ] || [ '$DB' = 'pdo/pgsql' ]; then psql -c 'create database ci_test;' -U postgres; fi" - sh -c "if [ '$DB' = 'mysql' ] || [ '$DB' = 'pdo/mysql' ]; then mysql -e 'create database IF NOT EXISTS ci_test;'; fi" -script: phpunit --configuration tests/travis/$DB.phpunit.xml +script: phpunit --coverage-text --configuration tests/travis/$DB.phpunit.xml branches: only: - - develop - - master
\ No newline at end of file + - develop
\ No newline at end of file |