diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-05-28 01:15:54 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-05-28 01:17:32 +0200 |
| commit | 147d01f7eeaeb38cad13376bcc2c88e07eb2fece (patch) | |
| tree | 2a027f05f7a3d6489f4d13d99e9663371489fe21 | |
| parent | a3c5809f942da4c89a210d41b9632e57de68a6bc (diff) | |
| parent | a9977686275f968a26272fb8bad28f7506f0043b (diff) | |
| download | forums-147d01f7eeaeb38cad13376bcc2c88e07eb2fece.tar forums-147d01f7eeaeb38cad13376bcc2c88e07eb2fece.tar.gz forums-147d01f7eeaeb38cad13376bcc2c88e07eb2fece.tar.bz2 forums-147d01f7eeaeb38cad13376bcc2c88e07eb2fece.tar.xz forums-147d01f7eeaeb38cad13376bcc2c88e07eb2fece.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11580] Enable prefer-source option (should error way less)
[ticket/11580] Enable --no-interaction option on composer for travis
Conflicts:
.travis.yml
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 8039e1d47e..c89ad38661 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ before_script: - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'create database IF NOT EXISTS phpbb_tests;'; fi" - travis/install-php-extensions.sh - cd phpBB - - php ../composer.phar install --dev + - php ../composer.phar install --dev --no-interaction --prefer-source - cd .. - sh -c "if [ `php -r "echo (int) version_compare(PHP_VERSION, '5.3.19', '>=');"` = "1" ]; then travis/setup-webserver.sh; fi" |