Add a branch alias for 11.x

Created on 3 June 2023, about 1 year ago
Updated 21 August 2023, 10 months ago

Problem/Motivation

11.x is a stand-in for a 'main' branch. One problem is that contrib modules don't (yet) declare compatibility with 11.x, and shouldn't need to, but composer won't install them unless they do.

Steps to reproduce

Proposed resolution

Add a branch alias for 11.x to 10.2.x - this will need to be updated every six months, so should eventually be incorporated into the branching script.

https://getcomposer.org/doc/articles/aliases.md

Remaining tasks

Make sure nothing (core tests, subtree splits) blows up.

User interface changes

API changes

Data model changes

Release notes snippet

πŸ“Œ Task
Status

Fixed

Version

11.0 πŸ”₯

Component
ComposerΒ  β†’

Last updated about 20 hours ago

No maintainer
Created by

πŸ‡¬πŸ‡§United Kingdom catch

Live updates comments and jobs are added and updated live.
Sign in to follow issues

Comments & Activities

  • Issue created by @catch
  • Status changed to Needs review about 1 year ago
  • last update about 1 year ago
    29,351 pass, 1 fail
  • πŸ‡¬πŸ‡§United Kingdom catch

    Not entirely sure how this is supposed to work even after reading the documentation, so let's suck it and see.

  • Status changed to Needs work about 1 year ago
  • πŸ‡«πŸ‡·France andypost

    lock file missed update

  • πŸ‡ΊπŸ‡ΈUnited States dww

    Don’t know if this should happen here or a separate issue, but I think Drupal::VERSION on 11.x branch (for now) should also be 10.2.0-dev

  • Status changed to Needs review about 1 year ago
  • last update about 1 year ago
    29,380 pass, 3 fail
  • last update about 1 year ago
    29,383 pass, 2 fail
  • πŸ‡ΊπŸ‡ΈUnited States dww

    I confess to not fully understanding if all this diff is legit, but here's what I got after applying patch #2, changing Drupal::VERSION, and running composer update nothing. Let's see if this helps. πŸ˜… Also uploading a partial patch with just the changes to Drupal::VERSION and composer.(json|lock).

  • πŸ‡¬πŸ‡§United Kingdom catch

    #6 looks pretty good. We may need to update https://github.com/xjm/drupal_core_release/blob/main/branch.sh to deal with this, but should check it's what we want first.

  • Status changed to Needs work about 1 year ago
  • πŸ‡«πŸ‡·France andypost

    Maybe instead of that branch should be 10.2.x with alias 11.x-dev?

    +++ b/core/lib/Drupal.php
    @@ -75,7 +75,7 @@ class Drupal {
    -  const VERSION = '11.0-dev';
    +  const VERSION = '10.2.0-dev';
    

    If this change applied then COMPOSER_ROOT_VERSION=11.x-dev composer update --lock is the only working command to create patch 6-full

    Using 10.2.x-dev fails

    core$ COMPOSER_ROOT_VERSION=10.2.x-dev composer update --lock
    > Drupal\Composer\Composer::ensureComposerVersion
    Loading composer repositories with package information
    Updating dependencies
    Your requirements could not be resolved to an installable set of packages.
    
      Problem 1
        - Root composer.json requires drupal/core == 11.9999999.9999999.9999999-dev, it is satisfiable by drupal/core[11.x-dev] from composer repo (https://repo.packagist.org) but drupal/core[10.2.x-dev] from path repo (core) has higher repository priority. The packages from the higher priority repository do not match your constraint and are therefore not installable. That repository is canonical so the lower priority repo's packages are not installable. See https://getcomposer.org/repoprio for details and assistance.
      Problem 2
        - Root composer.json requires drupal/core-project-message == 11.9999999.9999999.9999999-dev, it is satisfiable by drupal/core-project-message[11.x-dev] from composer repo (https://repo.packagist.org) but drupal/core-project-message[10.2.x-dev] from path repo (composer/Plugin/ProjectMessage) has higher repository priority. The packages from the higher priority repository do not match your constraint and are therefore not installable. That repository is canonical so the lower priority repo's packages are not installable. See https://getcomposer.org/repoprio for details and assistance.
      Problem 3
        - Root composer.json requires drupal/core-vendor-hardening == 11.9999999.9999999.9999999-dev, it is satisfiable by drupal/core-vendor-hardening[11.x-dev] from composer repo (https://repo.packagist.org) but drupal/core-vendor-hardening[10.2.x-dev] from path repo (composer/Plugin/VendorHardening) has higher repository priority. The packages from the higher priority repository do not match your constraint and are therefore not installable. That repository is canonical so the lower priority repo's packages are not installable. See https://getcomposer.org/repoprio for details and assistance.
    
  • πŸ‡¬πŸ‡§United Kingdom catch

    Looking at the failures in #6 I wonder if they are chicken and egg failures - composer is saying it can't find 10.2.x branch, but is that because we don't have the branch alias exposed to packagist because this issue isn't committed yet?

    If so, then it might actually be RTBC? Or we might have to skip those two tests here, commit it, then open an issue to unskip just in case?

  • πŸ‡¬πŸ‡§United Kingdom longwave UK

    I am not entirely sure. The issue here appears to relate to these in the top level composer.json:

        "require": {
            "drupal/core": "self.version",
            "drupal/core-project-message": "self.version",
            "drupal/core-vendor-hardening": "self.version"
        },
    

    The error seems to be saying that:

    • self.version is resolving to 11.x-dev
    • the path repos (local disk) provide 10.2.x
    • packagist can provide 11.x

    but the path repos have higher priority than packagist and so it is refusing to install. IIRC we use the path repos in preference because the tests shouldn't rely on network access to packagist at all. Do we need the path repos to provide both versions somehow?

  • πŸ‡¬πŸ‡§United Kingdom longwave UK
  • πŸ‡¬πŸ‡§United Kingdom catch

    OK this rings a bell, so no chicken egg but more of a real problem.

    https://github.com/composer/composer/issues/7847 looks related.

    Can we just use * instead of self.version in the hunk above?

  • Status changed to Needs review 11 months ago
  • last update 11 months ago
    29,840 pass
  • πŸ‡¬πŸ‡§United Kingdom longwave UK

    The metapackage templates need to specify the new alias in their dependencies instead of the original branch name, that makes the metapackage related tests pass.

    ComponentsIsolatedBuildTest appears to be broken and we are running into that here. I don't understand why it only hardcodes the Render and Utility components; we need all the dependee components to be registered as path repos to avoid hitting Packagist. The fix registers all components as path repos.

  • Status changed to Needs work 11 months ago
  • πŸ‡¬πŸ‡§United Kingdom longwave UK

    The change to core/lib/Drupal/Component/FileSecurity/composer.json is unnecessary, this was part of an earlier failed attempt.

  • Status changed to Needs review 11 months ago
  • last update 11 months ago
    29,873 pass
  • πŸ‡¬πŸ‡§United Kingdom catch

    Just #14 with the hunk mentioned in #15 removed.

  • πŸ‡¬πŸ‡§United Kingdom longwave UK
    +++ b/core/tests/Drupal/BuildTests/Composer/Component/ComponentsIsolatedBuildTest.php
    @@ -66,12 +66,10 @@ public function testComponentComposerJson(string $component_path): void {
    +      $package_name = 'drupal/core' . strtolower(preg_replace('/[A-Z]/', '-$0', substr($path, 1)));
    

    This is a bit hacky and maybe we should load the package name from the actual composer.json?

  • Status changed to RTBC 11 months ago
  • πŸ‡ΊπŸ‡ΈUnited States smustgrave

    Could we schedule a time next week, commit it, and do some immediate testing.

    If anything is broken we revert?

  • πŸ‡ΊπŸ‡ΈUnited States xjm

    Nifty.

    Can we file a followup against https://github.com/xjm/drupal_core_release pretty please? Thankses.

    • catch β†’ committed b28e3b76 on 11.x
      Issue #3364646 by dww, catch, longwave: Add a branch alias for 11.x
      
  • Status changed to Fixed 11 months ago
  • πŸ‡¬πŸ‡§United Kingdom catch

    Committed b28e3b7 and pushed to 11.x. Thanks!

    Let's find out what happens :)

  • πŸ‡ΊπŸ‡ΈUnited States pyrello

    I'm using https://github.com/joachim-n/drupal-core-development-project and was attempting to run a fresh installation of it today. Installation is broken: https://github.com/joachim-n/drupal-core-development-project. I'm wondering if it might be related to this update?

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

  • Status changed to Fixed 10 months ago
  • πŸ‡¬πŸ‡§United Kingdom joachim

    @pyrello It's not related to this fix, but it's caused by the 11.x branch being secretly 10.2.x.

    I've just updated the README to explain how to deal with it.

Production build 0.69.0 2024