Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 77c127e

Browse filesBrowse files
minor #38841 Fix CI for 3.4 (nicolas-grekas)
This PR was merged into the 3.4 branch. Discussion ---------- Fix CI for 3.4 | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Commits ------- 92e0b3c Fix CI for 3.4
2 parents 3dedf04 + 92e0b3c commit 77c127e
Copy full SHA for 77c127e

File tree

Expand file treeCollapse file tree

1 file changed

+4
-14
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+4
-14
lines changed

‎.travis.yml

Copy file name to clipboardExpand all lines: .travis.yml
+4-14Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,6 @@ before_install:
7878
export COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n' | sort)
7979
find ~/.phpenv -name xdebug.ini -delete
8080
81-
if [[ $TRAVIS_PHP_VERSION = 5.* ]]; then
82-
composer () {
83-
$HOME/.phpenv/versions/7.1/bin/php $HOME/.phpenv/versions/7.1/bin/composer config platform.php $(echo ' <?php echo preg_replace("/-.*/", "", PHP_VERSION);' | php /dev/stdin)
84-
$HOME/.phpenv/versions/7.1/bin/php $HOME/.phpenv/versions/7.1/bin/composer $*
85-
}
86-
export -f composer
87-
fi
88-
8981
nanoseconds () {
9082
local cmd="date"
9183
local format="+%s%N"
@@ -268,7 +260,9 @@ install:
268260
else
269261
export SYMFONY_REQUIRE=">=$SYMFONY_VERSION"
270262
fi
271-
composer global require --no-progress --no-scripts --no-plugins symfony/flex
263+
if [[ ! $TRAVIS_PHP_VERSION = 5.* ]]; then
264+
composer global require --no-progress --no-scripts --no-plugins symfony/flex
265+
fi
272266
273267
- |
274268
# Legacy tests are skipped when deps=high and when the current branch version has not the same major version number as the next one
@@ -304,11 +298,7 @@ install:
304298
([[ $deps ]] && cd src/Symfony/Component/HttpFoundation; composer config platform.ext-mongodb 1.6.0; composer require --dev --no-update mongodb/mongodb ~1.5.0)
305299
fi
306300
tfold 'composer update' $COMPOSER_UP
307-
if [[ $TRAVIS_PHP_VERSION = 5.* ]]; then
308-
tfold 'phpunit install' 'composer global remove symfony/flex && ./phpunit install && composer global require --no-progress --no-scripts --no-plugins symfony/flex'
309-
else
310-
tfold 'phpunit install' ./phpunit install
311-
fi
301+
tfold 'phpunit install' ./phpunit install
312302
if [[ $deps = high ]]; then
313303
echo "$COMPONENTS" | parallel --gnu "tfold {} 'cd {} && $COMPOSER_UP && $PHPUNIT_X$LEGACY'"
314304
elif [[ $deps = low ]]; then

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.