Skip to content

[ci] handle new 5.4 branch & make dev tests green #924

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 19, 2021

Conversation

jrushlow
Copy link
Collaborator

@jrushlow jrushlow commented Jul 5, 2021

  • We don't have a 5.x branch anymore on symfony/symfony - let's use the dev version specified in versions.json in place of the 5.x branch.
  • SYMFONY_REQUIRE env param in CI overrides the stability version specified for the run, resulting in a mixed set of versioned packages for each test. e.g. symfony/http === v5.3.0 && symfony/twig-bridge === v5.4.x-dev even though SYMFONY_SKELETON_STABILITY=dev is set.
  • some symfony components now use psr/log ^1 || ^2 || ^3 but doctrine/migrations still uses ^1. For migrations tests, because doctrine/orm is required after the skeleton has been built, there is a version conflict w/ the locked, psr/log:2.0 and doctrine/migrations. Calling psr/log:^1.1.4 resolves this issue and allows the tests to run.

contains @legacy tags for internal use:

@jrushlow jrushlow changed the title [ci] handle new 5.4 branch WIP - [ci] handle new 5.4 branch Jul 5, 2021
@jrushlow jrushlow changed the title WIP - [ci] handle new 5.4 branch [ci] handle new 5.4 branch & make dev tests green Jul 13, 2021
@jrushlow jrushlow added the Status: Needs Review Needs to be reviewed label Jul 13, 2021
@jrushlow jrushlow changed the title [ci] handle new 5.4 branch & make dev tests green [dont-merge] [ci] handle new 5.4 branch & make dev tests green Jul 14, 2021
@jrushlow jrushlow changed the title [dont-merge] [ci] handle new 5.4 branch & make dev tests green [ci] handle new 5.4 branch & make dev tests green Jul 19, 2021
* some symfony components use psr/log ^1 || ^2 || ^3
* once doctrine/migrations supports psr log >= 2, this line can be removed.
*/
->addExtraDependencies('psr/log:^1.1.4')
Copy link
Collaborator Author

@jrushlow jrushlow Jul 19, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@weaverryan need to make sure im not missing something here - w/o this "fix" we get the following in CI and locally against PHP 8 dev tests. See the description in the PR comments for a better explination

https://github.com/symfony/maker-bundle/runs/3099977944

1) Symfony\Bundle\MakerBundle\Tests\Maker\MakeMigrationTest::testExecute with data set "migration_with_changes" (Symfony\Bundle\MakerBundle\Test\MakerTestDetails Object (...))
Exception: Error running command: "composer require migrations doctrine/orm". Output: "". Error: "Using version ^3.1 for doctrine/doctrine-migrations-bundle
Using version ^2.9 for doctrine/orm
composer.json has been updated
Running composer update doctrine/doctrine-migrations-bundle doctrine/orm
Loading composer repositories with package information
Restricting packages listed in "symfony/symfony" to "5.4.*"
Updating dependencies
Your requirements could not be resolved to an installable set of packages.

  Problem 1
    - doctrine/doctrine-migrations-bundle[3.1.0, ..., 3.1.1] require doctrine/migrations ^3.1 -> satisfiable by doctrine/migrations[3.1.0, ..., 3.3.x-dev].
    - doctrine/doctrine-migrations-bundle[3.1.x-dev, ..., 3.2.x-dev] require doctrine/migrations ^3.2 -> satisfiable by doctrine/migrations[3.2.0, 3.2.x-dev, 3.3.x-dev].
    - doctrine/migrations[3.1.0, ..., 3.3.x-dev] require psr/log ^1.1.3 -> found psr/log[1.1.3, 1.1.4] but the package is fixed to 2.0.0 (lock file version) by a partial update and that version does not match. Make sure you list it as an argument for the update command.
    - Root composer.json requires doctrine/doctrine-migrations-bundle ^3.1 -> satisfiable by doctrine/doctrine-migrations-bundle[3.1.0, 3.1.1, 3.1.x-dev, 3.2.x-dev].

Use the option --with-all-dependencies (-W) to allow upgrades, downgrades and removals for packages currently locked to specific versions.

Installation failed, reverting composer.json and composer.lock to their original content.
"

/var/htdocs/src/Test/MakerTestProcess.php:51
/var/htdocs/src/Test/MakerTestEnvironment.php:154
/var/htdocs/src/Test/MakerTestCase.php:55
/var/htdocs/src/Test/MakerTestCase.php:33

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, I think this is correct. We need to watch doctrine/migrations#1184 and remove this when that's merged and there's a tag.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Issue added: #928

@weaverryan
Copy link
Member

Thank you Jesse!

@weaverryan weaverryan merged commit de749e3 into symfony:main Jul 19, 2021
@jrushlow jrushlow deleted the ci/dev-tests branch July 22, 2021 09:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Status: Needs Review Needs to be reviewed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants