8000 Merge branch '4.3' into 4.4 · symfony/symfony@5495b54 · GitHub
[go: up one dir, main page]
Skip to content

Commit 5495b54

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '4.3' into 4.4
* 4.3: [travis] install from dist except for selected components
2 parents 560ed53 + d5e1395 commit 5495b54

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

‎.github/composer-config.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
{
22
"config": {
33
"preferred-install": {
4+
"symfony/form": "source",
5+
"symfony/http-kernel": "source",
6+
"symfony/validator": "source",
47
"*": "dist"
58
}
69
}

‎.travis.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ before_install:
9494
9595
# tfold is a helper to create folded reports
9696
tfold () {
97-
local title="🐘 $SWAP$PHP $1"
97+
local title="🐘 $PHP $1 $FLIP"
9898
local fold=$(echo $title | sed -r 's/[^-_A-Za-z0-9]+/./g')
9999
shift
100100
local id=$(printf %08x $(( RANDOM * RANDOM )))
@@ -220,7 +220,7 @@ install:
220220
- |
221221
# For the master branch, when deps=high, the version before master is checked out and tested with the locally patched components
222222
if [[ $deps = high && $TRAVIS_BRANCH = master ]]; then
223-
export SWAP='🙃'
223+
export FLIP='🙃'
224224
SYMFONY_VERSION=$(git ls-remote --heads | grep -o '/[1-9].*' | tail -n 1 | sed s/.//) &&
225225
git fetch --depth=2 origin $SYMFONY_VERSION &&
226226
git checkout -m FETCH_HEAD &&
@@ -266,12 +266,12 @@ install:
266266
tfold 'composer update' $COMPOSER_UP
267267
tfold 'phpunit install' ./phpunit install
268268
if [[ $deps = high ]]; then
269-
echo "$COMPONENTS" | parallel --gnu "tfold {} 'cd {} && $COMPOSER_UP --prefer-source && $PHPUNIT_X$LEGACY'" || X=1
269+
echo "$COMPONENTS" | parallel --gnu "tfold {} 'cd {} && $COMPOSER_UP && $PHPUNIT_X$LEGACY'" || X=1
270270
(cd src/Symfony/Component/HttpFoundation; mv composer.bak composer.json)
271271
COMPONENTS=$(git diff --name-only src/ | grep composer.json || true)
272272
273273
if [[ $COMPONENTS && $LEGACY && $TRAVIS_PULL_REQUEST != false ]]; then
274-
export SWAP='🙃'
274+
export FLIP='🙃'
275275
COMPONENTS=$(echo "$COMPONENTS" | xargs dirname | sort)
276276
SYMFONY_VERSION=$(echo $SYMFONY_VERSION | awk '{print $1 - 1}')
277277
export SYMFONY_REQUIRE=">=$SYMFONY_VERSION"
@@ -280,15 +280,15 @@ install:
280280
git fetch --depth=2 origin $SYMFONY_VERSION
281281
git checkout -m FETCH_HEAD
282282
(cd src/Symfony/Component/HttpFoundation; composer config platform.ext-mongodb 1.6.0; composer require --dev --no-update mongodb/mongodb)
283-
echo "$COMPONENTS" | parallel --gnu "tfold {} 'cd {} && $COMPOSER_UP --prefer-source && $PHPUNIT_X$LEGACY'" || X=1
283+
echo "$COMPONENTS" | parallel --gnu "tfold {} 'cd {} && $COMPOSER_UP && $PHPUNIT_X$LEGACY'" || X=1
284284
fi
285285
286286
[[ ! $X ]] || (exit 1)
287287
elif [[ $deps = low ]]; then
288288
[[ -e ~/php-ext/composer-lowest.lock.tar ]] && tar -xf ~/php-ext/composer-lowest.lock.tar
289289
tar -cf ~/php-ext/composer-lowest.lock.tar --files-from /dev/null
290290
php .github/rm-invalid-lowest-lock-files.php $COMPONENTS
291-
echo "$COMPONENTS" | parallel --gnu "tfold {} 'cd {} && ([ -e composer.lock ] && ${COMPOSER_UP/update/install} || $COMPOSER_UP --prefer-lowest --prefer-stable --prefer-source) && $PHPUNIT_X'"
291+
echo "$COMPONENTS" | parallel --gnu "tfold {} 'cd {} && ([ -e composer.lock ] && ${COMPOSER_UP/update/install} || $COMPOSER_UP --prefer-lowest --prefer-stable) && $PHPUNIT_X'"
292292
echo "$COMPONENTS" | xargs -n1 -I{} tar --append -f ~/php-ext/composer-lowest.lock.tar {}/composer.lock
293293
else
294294
if [[ $PHP = 7.4* ]]; then

0 commit comments

Comments
 (0)
0