fix merge
This commit is contained in:
parent
694178e279
commit
ed36e64bd4
|
@ -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
|
||||
|
|
Reference in New Issue