Issue fork drupal-3627455

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:

About issue forks

Comments

xjm created an issue. See original summary.

xjm’s picture

xjm
she/her
Primary language English
commented
Issue summary: View changes
xjm’s picture

xjm
she/her
Primary language English
commented
Assigned: xjm » Unassigned
Issue summary: View changes
Status: Active » Needs work
Related issues: +#3625553: Use MAJOR.x-dev for generated dev-main aliases so release branches don't break BuilderTest

I thought the issue that was backported previously would fix this, but the initial 11.5.x pipeline failed with:

--- Drupal\Tests\Composer\Generator\BuilderTest ----
Status      Duration Info
--------------------------------------------------------------------------------------------------------
Pass          0.007s testBuilder with data set #0
Pass           <1 ms testBuilder with data set #1
Fail          0.016s testBuilder with data set #2
Failure              *** Process execution output ***
    PHPUnit 11.5.55 by Sebastian Bergmann and contributors.

    Runtime:       PHP 8.3.35
    Configuration: /builds/core/phpunit.xml.dist

    ..F                                                                 3 / 3 (100%)

    Time: 00:00.029, Memory: 8.00 MB

    Builder (Drupal\Tests\Composer\Generator\Builder)
     ✔ Builder with data set 0
     ✔ Builder with data set 1
     ✘ Builder with data set 2
       ┐
       ├ Failed asserting that two arrays are equal.
       ┊ ---·Expected
       ┊ +++·Actual
       ┊ @@ @@
       ┊      'conflict' => [...]
       ┊      'extra' => Array (
       ┊          'branch-alias' => Array (
       ┊ -············'dev-main'·=>·'11.x-dev'
       ┊ +············'dev-main'·=>·'11.5.x-dev'
       ┊          )
       ┊      )
       ┊  )
       │
       │ /builds/core/tests/Drupal/Tests/Composer/Generator/BuilderTest.php:120
       ┴

    FAILURES!
    Tests: 3, Assertions: 3, Failures: 1.

godotislate made their first commit to this issue’s fork.

godotislate opened merge request !17317

godotislate opened merge request !17318

godotislate’s picture

godotislate
he/him
commented
Status: Needs work » Needs review

We made the necessary change in composer/Generator/Builder/DrupalPinnedDevDependenciesBuilder.php for 11.4.x, but didn't for 11.x: https://git.drupalcode.org/project/drupal/-/commit/39ad57a7d9899c5f475de....

Making that same fix here with MRs for 11.x and 11.5.x.

xjm’s picture

xjm
she/her
Primary language English
commented
Title: Branch 11.5.x. » Branch 11.5.x and fix branch aliasing for PinnedDevDependencies

  • longwave committed ebe678d6 on 11.x 
    fix: #3627455 Branch 11.5.x and fix branch aliasing for...

  • longwave committed f6a03b75 on 11.5.x 
    fix: #3627455 Branch 11.5.x and fix branch aliasing for...
longwave’s picture

longwave
he/him
Primary language English
Location UK
commented
Version: 11.x-dev » 11.5.x-dev
Status: Needs review » Fixed

Committed both from NR as the patches are trivial and this was blocking all test runs on the 11.5.x branch.

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.