diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-05-28 01:15:02 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-05-28 01:15:02 +0200 |
| commit | a9977686275f968a26272fb8bad28f7506f0043b (patch) | |
| tree | 3bca4ec2350e1311103cf47cfc76e428abc43337 | |
| parent | 96b4066368e6e9c7f701daac7440807cce345702 (diff) | |
| parent | 65307f1382b870fbe6c56408dd30f12ff3b8c239 (diff) | |
| download | forums-a9977686275f968a26272fb8bad28f7506f0043b.tar forums-a9977686275f968a26272fb8bad28f7506f0043b.tar.gz forums-a9977686275f968a26272fb8bad28f7506f0043b.tar.bz2 forums-a9977686275f968a26272fb8bad28f7506f0043b.tar.xz forums-a9977686275f968a26272fb8bad28f7506f0043b.zip | |
Merge remote-tracking branch 'nickvergessen/ticket/11580' into develop-olympus
* nickvergessen/ticket/11580:
[ticket/11580] Enable prefer-source option (should error way less)
[ticket/11580] Enable --no-interaction option on composer for travis
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index b08d677bc8..5e2569dd22 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ before_script: - 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; phpenv rehash; fi" - cd phpBB - - sh -c "if [ '$TRAVIS_PHP_VERSION' != '5.2' ]; then php ../composer.phar install --dev; fi" + - sh -c "if [ '$TRAVIS_PHP_VERSION' != '5.2' ]; then php ../composer.phar install --dev --no-interaction --prefer-source; fi" - cd .. - sh -c "if [ `php -r "echo (int) version_compare(PHP_VERSION, '5.3.19', '>=');"` = "1" ]; then travis/setup-webserver.sh; fi" |