fix merge

This commit is contained in:
Nicolas Grekas 2018-08-03 13:22:40 +02:00
parent 694178e279
commit ed36e64bd4
1 changed files with 1 additions and 3 deletions

View File

@ -207,9 +207,7 @@ install:
phpenv global $PHP
tfold 'composer update' $COMPOSER_UP
tfold 'phpunit install' ./phpunit install
if [[ $PHP = 7.* ]]; then
([[ $deps ]] && cd src/Symfony/Component/HttpFoundation; composer require --dev --no-update mongodb/mongodb)
fi
([[ $deps ]] && cd src/Symfony/Component/HttpFoundation; composer require --dev --no-update mongodb/mongodb)
if [[ $deps = high ]]; then
echo "$COMPONENTS" | parallel --gnu -j10% "tfold {} 'cd {} && $COMPOSER_UP && $PHPUNIT_X$LEGACY'"
elif [[ $deps = low ]]; then