@@ -195,7 +195,7 @@ install:
195195 git fetch --depth=2 origin refs/pull/$SYMFONY_PHPUNIT_BRIDGE_PR/head
196196 git rm -rq src/Symfony/Bridge/PhpUnit
197197 git checkout -q FETCH_HEAD -- src/Symfony/Bridge/PhpUnit
198- SYMFONY_VERSION=$(cat src/Symfony/Bridge/PhpUnit/composer.json | grep '^ *"dev-master". *"[1-9]' | grep -o '[0-9.]*')
198+ export SYMFONY_VERSION=$(cat src/Symfony/Bridge/PhpUnit/composer.json | grep '^ *"dev-master". *"[1-9]' | grep -o '[0-9.]*')
199199 sed -i 's/"symfony\/phpunit-bridge": ".*"/"symfony\/phpunit-bridge": "'$SYMFONY_VERSION'.x@dev"/' composer.json
200200 rm -rf .phpunit
201201 fi
@@ -208,7 +208,7 @@ install:
208208 export SYMFONY_DEPRECATIONS_HELPER=weak &&
209209 cp composer.json composer.json.orig &&
210210 echo -e '{\n"require":{'"$(grep phpunit-bridge composer.json)"'"php":"*"},"minimum-stability":"dev"}' > composer.json &&
211- php .github/build-packages.php HEAD^ $(find src/Symfony -mindepth 3 -type f -name composer.json -printf '%h\n') &&
211+ php .github/build-packages.php HEAD^ $(find src/Symfony -mindepth 3 -type f -name composer.json -printf '%h\n' | sort ) &&
212212 mv composer.json composer.json.phpunit &&
213213 mv composer.json.orig composer.json
214214 fi
@@ -221,12 +221,12 @@ install:
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
223223 export FLIP='🙃'
224- SYMFONY_VERSION=$(git ls-remote --heads | grep -o '/[1-9].*' | tail -n 1 | sed s/.//) &&
224+ export 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 &&
227227 export COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n' | sort)
228228 else
229- SYMFONY_VERSION=$(cat composer.json | grep '^ *"dev-master". *"[1-9]' | grep -o '[0-9.]*')
229+ export SYMFONY_VERSION=$(cat composer.json | grep '^ *"dev-master". *"[1-9]' | grep -o '[0-9.]*')
230230 fi
231231
232232|
@@ -281,7 +281,7 @@ install:
281281 COMPONENTS=$(echo "$COMPONENTS" | xargs dirname | xargs -n1 -I{} bash -c "[ -e '{}/phpunit.xml.dist' ] && echo '{}'" | sort)
282282 (cd src/Symfony/Component/HttpFoundation; composer config platform.ext-mongodb 1.6.0; composer require --dev --no-update mongodb/mongodb)
283283 [[ ! $COMPONENTS ]] || tfold 'phpunit install' SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT=1 ./phpunit install
284- [[ ! $COMPONENTS ]] || echo "$COMPONENTS" | parallel --gnu "tfold {} 'cd {} && $COMPOSER_UP && $PHPUNIT_X$LEGACY'" || X=1
284+ [[ ! $COMPONENTS ]] || echo "$COMPONENTS" | parallel --gnu "tfold {} 'cd {} && rm composer.lock vendor/ -Rf && $COMPOSER_UP && $PHPUNIT_X$LEGACY'" || X=1
285285 fi
286286
287287 [[ ! $X ]] || (exit 1)
@@ -300,7 +300,7 @@ install:
300300 composer install --optimize-autoloader
301301 php .github/patch-types.php
302302 php .github/patch-types.php # ensure the script is idempotent
303- export PHPUNIT_X="$PHPUNIT_X,legacy"
303+ PHPUNIT_X="$PHPUNIT_X,legacy"
304304 fi
305305
306306 echo "$COMPONENTS" | parallel --gnu "tfold {} $PHPUNIT_X {}"
0 commit comments