8000 Merge branch '2.8' into 3.4 · symfony/symfony@cbe9822 · GitHub
[go: up one dir, main page]
Skip to content

Commit cbe9822

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.8' into 3.4
* 2.8: [travis] disable symfony/flex during phpunit install
2 parents 05dccf8 + 411e0c5 commit cbe9822

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

‎.travis.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,11 @@ install:
249249
([[ $deps ]] && cd src/Symfony/Component/HttpFoundation; composer config platform.ext-mongodb 1.5.0; composer require --dev --no-update mongodb/mongodb)
250250
fi
251251
tfold 'composer update' $COMPOSER_UP
252-
tfold 'phpunit install' ./phpunit install
252+
if [[ $TRAVIS_PHP_VERSION = 5.* || $TRAVIS_PHP_VERSION = hhvm* ]]; then
253+
tfold 'phpunit install' 'composer global remove symfony/flex && ./phpunit install && composer global require --no-progress --no-scripts --no-plugins symfony/flex dev-master'
254+
else
255+
tfold 'phpunit install' ./phpunit install
256+
fi
253257
if [[ $deps = high ]]; then
254258
echo "$COMPONENTS" | parallel --gnu -j10% "tfold {} 'cd {} && $COMPOSER_UP && $PHPUNIT_X$LEGACY'"
255259
elif [[ $deps = low ]]; then

0 commit comments

Comments
 (0)
0