summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-05-24 21:32:47 +0200
committerAndrey Andreev <narf@bofh.bg>2012-05-24 21:32:47 +0200
commit13d0575d9ba20a1e4bdebe00638a682e37b8bcb5 (patch)
treeff6d371d275a558e0b4cc32a3a88f2ed544d2653 /.travis.yml
parent55d3ad4faf2727b900832884e7c219076a255b66 (diff)
parent76e2f034f55b7e0f678f22043eb841b428377fa6 (diff)
Merge pull request #1392 from toopay/travis-ci
Travis ci
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml8
1 files changed, 3 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 97ea0422d..6a7d37812 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,9 +13,8 @@ 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"
@@ -24,5 +23,4 @@ script: phpunit --configuration tests/travis/$DB.phpunit.xml
branches:
only:
- - develop
- - master \ No newline at end of file
+ - develop \ No newline at end of file