minor #35630 [travis] fix patching return types of symfony/contracts (nicolas-grekas)
This PR was merged into the 4.4 branch.
Discussion
----------
[travis] fix patching return types of symfony/contracts
| Q | A
| ------------- | ---
| Branch? | 4.4
| Bug fix? | no
| New feature? | no
| Deprecations? | no
| Tickets | -
| License | MIT
| Doc PR | -
Fixing failing builds like https://travis-ci.org/symfony/symfony/jobs/647233182
Commits
-------
076a2a0a71
[travis] fix patching return types of symfony/contracts
This commit is contained in:
commit
3bfd4ed237
@ -285,7 +285,7 @@ install:
|
|||||||
(cd src/Symfony/Component/HttpFoundation; mv composer.bak composer.json)
|
(cd src/Symfony/Component/HttpFoundation; mv composer.bak composer.json)
|
||||||
COMPONENTS=$(git diff --name-only src/ | grep composer.json || true)
|
COMPONENTS=$(git diff --name-only src/ | grep composer.json || true)
|
||||||
|
|
||||||
if [[ $COMPONENTS && $LEGACY && $TRAVIS_PULL_REQUEST != false ]]; then
|
if [[ $COMPONENTS && $LEGACY && $TRAVIS_BRANCH != master && $TRAVIS_PULL_REQUEST != false ]]; then
|
||||||
export FLIP='🙃'
|
export FLIP='🙃'
|
||||||
SYMFONY_VERSION=$(echo $SYMFONY_VERSION | awk '{print $1 - 1}')
|
SYMFONY_VERSION=$(echo $SYMFONY_VERSION | awk '{print $1 - 1}')
|
||||||
echo -e "\\n\\e[33;1mChecking out Symfony $SYMFONY_VERSION and running tests with patched components as deps\\e[0m"
|
echo -e "\\n\\e[33;1mChecking out Symfony $SYMFONY_VERSION and running tests with patched components as deps\\e[0m"
|
||||||
@ -309,7 +309,7 @@ install:
|
|||||||
else
|
else
|
||||||
if [[ $PHP = 7.4* ]]; then
|
if [[ $PHP = 7.4* ]]; then
|
||||||
# add return types before running the test suite
|
# add return types before running the test suite
|
||||||
rm vendor/symfony/contracts -Rf
|
rm src/Symfony/Contract -Rf && mv vendor/symfony/contracts src/Symfony/Contract
|
||||||
ln -sd $(realpath src/Symfony/Contracts) vendor/symfony/contracts
|
ln -sd $(realpath src/Symfony/Contracts) vendor/symfony/contracts
|
||||||
sed -i 's/"\*\*\/Tests\/"//' composer.json
|
sed -i 's/"\*\*\/Tests\/"//' composer.json
|
||||||
composer install --optimize-autoloader
|
composer install --optimize-autoloader
|
||||||
|
Reference in New Issue
Block a user