Merge branch '4.4' into 5.1
* 4.4: Fix .github/build-packages.php
This commit is contained in:
commit
d7afcf2dc5
2
.github/build-packages.php
vendored
2
.github/build-packages.php
vendored
@ -54,7 +54,7 @@ foreach ($dirs as $k => $dir) {
|
||||
echo "Missing \"branch-version\" in composer.json's \"extra\".\n";
|
||||
exit(1);
|
||||
}
|
||||
$package->version = substr_replace($package->extra->{'branch-version'}, '.x-dev', -4);
|
||||
$package->version = $package->extra->{'branch-version'}.'.x-dev';
|
||||
$package->dist['type'] = 'tar';
|
||||
$package->dist['url'] = 'file://'.str_replace(DIRECTORY_SEPARATOR, '/', dirname(__DIR__))."/$dir/package.tar";
|
||||
|
||||
|
@ -209,7 +209,7 @@ install:
|
||||
git fetch --depth=2 origin refs/pull/$SYMFONY_PHPUNIT_BRIDGE_PR/head
|
||||
git rm -rq src/Symfony/Bridge/PhpUnit
|
||||
git checkout -q FETCH_HEAD -- src/Symfony/Bridge/PhpUnit
|
||||
export SYMFONY_VERSION=$(cat src/Symfony/Bridge/PhpUnit/composer.json | grep '^ *"branch-version": *"[1-9]' | grep -o '[0-9.]*')
|
||||
export SYMFONY_VERSION=$(cat src/Symfony/Bridge/PhpUnit/composer.json | grep '^ *"branch-version". *"[1-9]' | grep -o '[0-9.]*')
|
||||
sed -i 's/"symfony\/phpunit-bridge": ".*"/"symfony\/phpunit-bridge": "'$SYMFONY_VERSION'.x@dev"/' composer.json
|
||||
rm -rf .phpunit
|
||||
fi
|
||||
@ -243,7 +243,7 @@ install:
|
||||
git checkout -m FETCH_HEAD &&
|
||||
export COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n' | sort)
|
||||
else
|
||||
export SYMFONY_VERSION=$(cat composer.json | grep '^ *"branch-version": *"[1-9]' | grep -o '[0-9.]*')
|
||||
export SYMFONY_VERSION=$(cat composer.json | grep '^ *"branch-version". *"[1-9]' | grep -o '[0-9.]*')
|
||||
fi
|
||||
|
||||
- |
|
||||
@ -270,7 +270,7 @@ install:
|
||||
|
||||
- |
|
||||
# Legacy tests are skipped when deps=high and when the current branch version has not the same major version number as the next one
|
||||
[[ $deps = high && ${SYMFONY_VERSION%.*} != $(git show $(git ls-remote --heads | grep -FA1 /$SYMFONY_VERSION | tail -n 1):composer.json | grep '^ *"branch-version": *"[1-9]' | grep -o '[0-9]*' | head -n 1) ]] && export LEGACY=,legacy
|
||||
[[ $deps = high && ${SYMFONY_VERSION%.*} != $(git show $(git ls-remote --heads | grep -FA1 /$SYMFONY_VERSION | tail -n 1):composer.json | grep '^ *"branch-version". *"[1-9]' | grep -o '[0-9]*' | head -n 1) ]] && export LEGACY=,legacy
|
||||
|
||||
export COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev
|
||||
if [[ $deps ]]; then mv composer.json.phpunit composer.json; fi
|
||||
|
Reference in New Issue
Block a user