From 076a2a0a71749a9a9e2ba69a669cafd55cb74643 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Fri, 7 Feb 2020 10:30:39 +0100 Subject: [PATCH] [travis] fix patching return types of symfony/contracts --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 29e9da2cc5..ab66bbbed9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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