Problem/Motivation

The main branch has been opened but there are a handful of test failures to solve.

Steps to reproduce

https://git.drupalcode.org/project/drupal/-/pipelines/711592

Proposed resolution

Remaining tasks

User interface changes

Introduced terminology

API changes

Data model changes

Release notes snippet

Issue fork drupal-3567459

Command icon Show commands

Start within a Git clone of the project using the version control instructions.

Or, if you do not have SSH keys set up on git.drupalcode.org:

Comments

longwave created an issue. See original summary.

longwave’s picture

Status: Active » Needs review

Pipeline is green.

catch’s picture

Status: Needs review » Fixed

Committing this from needs review to try to get main to a green pipeline. Nothing controversial in here hopefully, retrospective reviews would be appreciated though.

Now that this issue is closed, review the contribution record.

As a contributor, attribute any organization that helped you, or if you volunteered your own time.

Maintainers, credit people who helped resolve this issue.

  • catch committed 9d977f73 on main
    fix: #3567459 Fix test failures on main branch
    
    By: longwave
    
dcam’s picture

I looked at it. It's disappointing that we can't use dev-main in those Composer requirements because that means it's just one more thing we have to keep up to date with versions. I'm not deeply familiar with how the Composer scaffolding works, but I can see how dev-main just wouldn't work there. It makes sense to me.

longwave’s picture

Agreed, it should work, and perhaps we just need an alias adding somewhere, but the test is slightly contrived - it wants to test as if it were a release branch, even though it's not - so I was wary of altering the test at all here in case I broke it in a different way. As a tradeoff we only have to update some numbers once every two years, so effort in fixing this is probably better spent elsewhere.

dcam’s picture

As a tradeoff we only have to update some numbers once every two years, so effort in fixing this is probably better spent elsewhere.

Agreed. I'd rather see us move forward with switching to the main branch sooner rather than hold it up for something that's so easily handled.

dww’s picture

Not sure if we should re-open this and resolve here, or handle it in separate issues, but I still can't get a core MR to run tests against main.

https://git.drupalcode.org/project/drupal/-/merge_requests/14347/pipelines

First, the issue fork branch was off 11.x while the MR defaulted to targeting main. That led to all the jobs failing in composer validate with:

In VersionParser.php line 191:
                                     
  Invalid version string "main-dev"

https://git.drupalcode.org/issue/drupal-3567589/-/pipelines/712207

Then, I rebased to main, tried again. Now, thanks to .gitlab-ci.yml, we're trying to install drupal/config_inspector but there's no D12 release:

Your requirements could not be resolved to an installable set of packages.
  Problem 1
    - Root composer.json requires drupal/config_inspector * -> satisfiable by drupal/config_inspector[dev-1.x, dev-2.0.x, dev-2.1.x, 1.0.0-alpha1, ..., 1.x-dev, 2.0.1, ..., 2.1.x-dev].
    - drupal/config_inspector[1.0.0-alpha1, ..., 1.0.0-beta2] require drupal/core ^8 -> found drupal/core[8.0.0-beta6, ..., 8.9.x-dev] but it conflicts with your root composer.json require (12.x-dev).
    - drupal/config_inspector[dev-1.x, dev-2.0.x, 1.0.0, ..., 1.x-dev, 2.0.1, ..., 2.0.x-dev] require drupal/core ^8 || ^9 -> found drupal/core[8.0.0-beta6, ..., 8.9.x-dev, 9.0.0-alpha1, ..., 9.5.x-dev] but it conflicts with your root composer.json require (12.x-dev).
    - drupal/config_inspector[2.1.0, ..., 2.1.4] require drupal/core ^9.2 || ^10 -> found drupal/core[9.2.0-alpha1, ..., 9.5.x-dev, 10.0.0-alpha1, ..., 10.6.x-dev] but it conflicts with your root composer.json require (12.x-dev).
    - drupal/config_inspector[dev-2.1.x, 2.1.5, ..., 2.1.x-dev] require drupal/core ^9.2 || ^10 || ^11 -> found drupal/core[9.2.0-alpha1, ..., 9.5.x-dev, 10.0.0-alpha1, ..., 10.6.x-dev, 11.0.0-alpha1, ..., 11.x-dev] but it conflicts with your root composer.json require (12.x-dev).
Use the option --with-all-dependencies (-W) to allow upgrades, downgrades and removals for packages currently locked to specific versions.
You can also try re-running composer require with an explicit version constraint, e.g. "composer require drush/drush:*" to figure out if any version is installable, or "composer require drush/drush:^2.1" if you know which you need.
Installation failed, reverting ./composer.json and ./composer.lock to their original content.

https://git.drupalcode.org/issue/drupal-3567589/-/pipelines/712242

andypost’s picture

Curious why composer complains/fail for `main` branch when it should be reported as dev-main

UnexpectedValueException: Invalid version string "main" in
Composer\Semver\VersionParser->normalize() (line 186 of
/var/www/d9/vendor/composer/semver/src/VersionParser.php).
longwave’s picture

@andypost link to the MR/CI job where that happened?

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.