diff options
author | Timothy Warren <tim@timshomepage.net> | 2012-05-30 13:57:26 +0200 |
---|---|---|
committer | Timothy Warren <tim@timshomepage.net> | 2012-05-30 13:57:26 +0200 |
commit | fd2ceab417bbb696134910ce0eaeca34bea3e1e5 (patch) | |
tree | 0eeb742a553a36bf2375793661ff3e7925f792a6 /.travis.yml | |
parent | 6763522d29416b7db90a6d3c5dceffe1536d8efe (diff) | |
parent | 11fd4b8759438f216318e3e1e004f918b88a56ad (diff) |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into email
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 |