diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:
Nicolas Grekas 2020-02-07 10:38:19 +01:00
parent ddc00ed29d 076a2a0a71
commit 3bfd4ed237
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -285,7 +285,7 @@ install:
(cd src/Symfony/Component/HttpFoundation; mv composer.bak composer.json)
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='🙃'
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"
@ -309,7 +309,7 @@ install:
else
if [[ $PHP = 7.4* ]]; then
# 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
sed -i 's/"\*\*\/Tests\/"//' composer.json
composer install --optimize-autoloader