From b40e71f096d6dc8f265f87cd7a93de27ac02d49c Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Wed, 27 Jan 2021 14:48:15 +0100 Subject: [PATCH] Replace "branch-version" by "versions" in composer.json --- .appveyor.yml | 3 ++- .github/build-packages.php | 2 +- .github/workflows/tests.yml | 3 ++- .travis.yml | 8 +++++--- composer.json | 12 +++++++----- src/Symfony/Contracts/Cache/composer.json | 1 - src/Symfony/Contracts/EventDispatcher/composer.json | 1 - src/Symfony/Contracts/HttpClient/composer.json | 1 - src/Symfony/Contracts/Service/composer.json | 1 - src/Symfony/Contracts/Translation/composer.json | 1 - src/Symfony/Contracts/composer.json | 1 - 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index a2f36f9d97..41d9c8d45d 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -50,9 +50,10 @@ install: - php composer.phar global require --no-progress --no-scripts --no-plugins symfony/flex - git config --global user.email "" - git config --global user.name "Symfony" - - FOR /F "tokens=* USEBACKQ" %%F IN (`bash -c "grep branch-version composer.json | grep -o '[0-9.x]*'"`) DO (SET SYMFONY_VERSION=%%F) + - FOR /F "tokens=* USEBACKQ" %%F IN (`bash -c "grep -m1 SYMFONY_VERSION .travis.yml | grep -o '[0-9.x]*'"`) DO (SET SYMFONY_VERSION=%%F) - php .github/build-packages.php HEAD^ %SYMFONY_VERSION% src\Symfony\Bridge\PhpUnit - SET "SYMFONY_REQUIRE=>=%SYMFONY_VERSION%" + - SET COMPOSER_ROOT_VERSION=%SYMFONY_VERSION%.x-dev - php composer.phar update --no-progress --ansi - php phpunit install diff --git a/.github/build-packages.php b/.github/build-packages.php index c8c802ad59..30dcf0c9ad 100644 --- a/.github/build-packages.php +++ b/.github/build-packages.php @@ -46,7 +46,7 @@ foreach ($dirs as $k => $dir) { passthru("cd $dir && git init && git add . && git commit -q -m - && git archive -o package.tar HEAD && rm .git/ -Rf"); } - $package->version = (isset($package->extra->{'branch-version'}) ? $package->extra->{'branch-version'} : $version).'.x-dev'; + $package->version = preg_replace('/(?:\.x)?-dev$/', '', $package->extra->{'branch-alias'}->{'dev-main'} ?? $version).'.x-dev'; $package->dist['type'] = 'tar'; $package->dist['url'] = 'file://'.str_replace(DIRECTORY_SEPARATOR, '/', dirname(__DIR__))."/$dir/package.tar"; diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0038195fcf..9ef0b10c04 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -80,8 +80,9 @@ jobs: - name: Configure composer run: | COMPOSER_HOME="$(composer config home)" + composer self-update ([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json" - echo "COMPOSER_ROOT_VERSION=$(grep branch-version composer.json | grep -o '[0-9.x]*').x-dev" >> $GITHUB_ENV + echo "COMPOSER_ROOT_VERSION=$(grep -m1 SYMFONY_VERSION .travis.yml | grep -o '[0-9.x]*').x-dev" >> $GITHUB_ENV - name: Determine composer cache directory id: composer-cache diff --git a/.travis.yml b/.travis.yml index 78e02c8c7a..fb3910f44b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ addons: env: global: + - SYMFONY_VERSION=4.4 - MIN_PHP=7.1.3 - SYMFONY_PROCESS_PHP_TEST_BINARY=~/.phpenv/shims/php - SYMFONY_PHPUNIT_DISABLE_RESULT_CACHE=1 @@ -170,8 +171,8 @@ 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=$(curl -s https://api.github.com/repos/symfony/symfony/pulls/$SYMFONY_PHPUNIT_BRIDGE_PR | jq -r .base.ref) - sed -i 's/"symfony\/phpunit-bridge": ".*"/"symfony\/phpunit-bridge": "'$SYMFONY_VERSION'.x@dev"/' composer.json + SYMFONY_PHPUNIT_BRIDGE_REF=$(curl -s https://api.github.com/repos/symfony/symfony/pulls/$SYMFONY_PHPUNIT_BRIDGE_PR | jq -r .base.ref) + sed -i 's/"symfony\/phpunit-bridge": ".*"/"symfony\/phpunit-bridge": "'$SYMFONY_PHPUNIT_BRIDGE_REF'.x@dev"/' composer.json rm -rf .phpunit fi @@ -180,7 +181,6 @@ install: git config --global user.email "" git config --global user.name "Symfony" - export SYMFONY_VERSION=$(grep branch-version composer.json | grep -o '[0-9.x]*') SYMFONY_VERSIONS=$(git ls-remote -q --heads); if [[ ! $deps ]]; then @@ -227,6 +227,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%.*} != $(echo "$SYMFONY_VERSIONS" | cut -f2 | grep -FA1 /$SYMFONY_VERSION | tail -n 1 | 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 - | @@ -265,6 +266,7 @@ install: 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" + export COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev export SYMFONY_REQUIRE=">=$SYMFONY_VERSION" git fetch --depth=2 origin $SYMFONY_VERSION git checkout -m FETCH_HEAD diff --git a/composer.json b/composer.json index c228650326..e12e14c163 100644 --- a/composer.json +++ b/composer.json @@ -156,11 +156,13 @@ "repositories": [ { "type": "path", - "url": "src/Symfony/Contracts" + "url": "src/Symfony/Contracts", + "options": { + "versions": { + "symfony/contracts": "1.1.x-dev" + } + } } ], - "minimum-stability": "dev", - "extra": { - "branch-version": "4.4" - } + "minimum-stability": "dev" } diff --git a/src/Symfony/Contracts/Cache/composer.json b/src/Symfony/Contracts/Cache/composer.json index ce40614881..dc2b77146c 100644 --- a/src/Symfony/Contracts/Cache/composer.json +++ b/src/Symfony/Contracts/Cache/composer.json @@ -33,7 +33,6 @@ } }, "extra": { - "branch-version": "1.1", "branch-alias": { "dev-main": "1.1-dev" } diff --git a/src/Symfony/Contracts/EventDispatcher/composer.json b/src/Symfony/Contracts/EventDispatcher/composer.json index 35258e78b7..0d14e98fea 100644 --- a/src/Symfony/Contracts/EventDispatcher/composer.json +++ b/src/Symfony/Contracts/EventDispatcher/composer.json @@ -33,7 +33,6 @@ } }, "extra": { - "branch-version": "1.1", "branch-alias": { "dev-main": "1.1-dev" } diff --git a/src/Symfony/Contracts/HttpClient/composer.json b/src/Symfony/Contracts/HttpClient/composer.json index f4bcfb2a36..b56709738b 100644 --- a/src/Symfony/Contracts/HttpClient/composer.json +++ b/src/Symfony/Contracts/HttpClient/composer.json @@ -32,7 +32,6 @@ } }, "extra": { - "branch-version": "1.1", "branch-alias": { "dev-main": "1.1-dev" } diff --git a/src/Symfony/Contracts/Service/composer.json b/src/Symfony/Contracts/Service/composer.json index 4f24e1e03d..8134ba6b88 100644 --- a/src/Symfony/Contracts/Service/composer.json +++ b/src/Symfony/Contracts/Service/composer.json @@ -33,7 +33,6 @@ } }, "extra": { - "branch-version": "1.1", "branch-alias": { "dev-main": "1.1-dev" } diff --git a/src/Symfony/Contracts/Translation/composer.json b/src/Symfony/Contracts/Translation/composer.json index 2b4ddbb386..8fd0d88df7 100644 --- a/src/Symfony/Contracts/Translation/composer.json +++ b/src/Symfony/Contracts/Translation/composer.json @@ -32,7 +32,6 @@ } }, "extra": { - "branch-version": "1.1", "branch-alias": { "dev-main": "1.1-dev" } diff --git a/src/Symfony/Contracts/composer.json b/src/Symfony/Contracts/composer.json index ec475e2670..62b123dc6b 100644 --- a/src/Symfony/Contracts/composer.json +++ b/src/Symfony/Contracts/composer.json @@ -46,7 +46,6 @@ }, "minimum-stability": "dev", "extra": { - "branch-version": "1.1", "branch-alias": { "dev-main": "1.1-dev" }