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

Skip to content

Commit f082f41

Browse files
Merge branch '2.8' into 3.4
* 2.8: [travis] fix requiring mongodb/mongodb before composer up
2 parents ff33771 + f50ee9b commit f082f41

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,11 +229,11 @@ install:
229229
break
230230
fi
231231
phpenv global ${PHP/hhvm*/hhvm}
232-
tfold 'composer update' $COMPOSER_UP
233-
tfold ' 6253 ;phpunit install' ./phpunit install
234232
if [[ $PHP = 7.* ]]; then
235233
([[ $deps ]] && cd src/Symfony/Component/HttpFoundation; composer require --dev --no-update mongodb/mongodb)
236234
fi
235+
tfold 'composer update' $COMPOSER_UP
236+
tfold 'phpunit install' ./phpunit install
237237
if [[ $deps = high ]]; then
238238
echo "$COMPONENTS" | parallel --gnu -j10% "tfold {} 'cd {} && $COMPOSER_UP && $PHPUNIT_X$LEGACY'"
239239
elif [[ $deps = low ]]; then

0 commit comments

Comments
 (0)
0