Problem/Motivation

.gitlab-ci.yml in 11.x has additional steps to enable corepack so we can use Yarn 4, but this means future changes to the file will be trickier to backport. However, we can safely enable corepack in 10.3.x and continue to use Yarn 1 there, which keeps the CI config in sync and makes backports simpler.

Steps to reproduce

Proposed resolution

Copy most/all of .gitlab-ci.yml from 11.x to 10.3.x.

Remaining tasks

User interface changes

API changes

Data model changes

Release notes snippet

CommentFileSizeAuthor
#10 3428614-nr-bot.txt1.34 KBneeds-review-queue-bot

Issue fork drupal-3428614

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

longwave created an issue. See original summary.

longwave’s picture

longwave
he/him
Primary language English
Location UK
commented
Version: 11.x-dev » 10.3.x-dev
Related issues: +#3109556: Update from Yarn 1 to Yarn 4
andypost’s picture

andypost
he/him
Primary language Russian
commented
Related issues: +#3428122: Add packageManager key to core/package.json now we recommend corepack enable
longwave’s picture

longwave
he/him
Primary language English
Location UK
commented
Title: Resync .gitlab-ci.yml following Yarn 4 in 11.x » Resync .gitlab-ci.yml and .gitignore following Yarn 4 in 11.x

While we are here we should also add .yarn to core/.gitignore because Yarn 4 uses it and ignores it, then you switch to a Yarn 1 branch and remnants are left behind.

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

catch’s picture

catch
he/him
Primary language English
commented
Status: Active » Needs review

Ran into cherry-pick conflicts on #3463479: Merge the build and lint stages in core MR pipelines, added an MR here.

catch opened merge request !8949

catch changed the visibility of the branch 3428614-resync-.gitlab-ci.yml-and to hidden.

catch opened merge request !8950

needs-review-queue-bot’s picture

needs-review-queue-bot commented
Status: Needs review » Needs work
StatusFileSize
new 3428614-nr-bot.txt1.34 KB

The Needs Review Queue Bot tested this issue. It fails the Drupal core commit checks. Therefore, this issue status is now "Needs work".

This does not mean that the patch necessarily needs to be re-rolled or the MR rebased. Read the Issue Summary, the issue tags and the latest discussion here to determine what needs to be done.

Consult the Drupal Contributor Guide to find step-by-step guides for working with issues.

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

nod_’s picture

nod_
Primary language French
Location Lille
commented
Status: Needs work » Needs review

.

catch’s picture

catch
he/him
Primary language English
commented
Version: 10.3.x-dev » 10.4.x-dev

Changing the branch to hopefully increase the bot happiness.

nod_’s picture

nod_
Primary language French
Location Lille
commented
Status: Needs review » Reviewed & tested by the community

Seems like it did the trick

nod_ closed merge request !8950

  • nod_ committed 8b2a6cac on 10.3.x 
    Issue #3428614 by catch, nod_, longwave: Resync .gitlab-ci.yml and ....

  • nod_ committed c559ce64 on 10.4.x 
    Issue #3428614 by catch, nod_, longwave: Resync .gitlab-ci.yml and ....
nod_’s picture

nod_
Primary language French
Location Lille
commented
Version: 10.4.x-dev » 10.3.x-dev
Status: Reviewed & tested by the community » Fixed

Committed and pushed c559ce6491 to 10.4.x and 8b2a6cacf2 to 10.3.x. Thanks!

  • nod_ committed 1a5427d5 on 10.4.x 
    Revert "Issue #3428614 by catch, nod_, longwave: Resync .gitlab-ci.yml...

  • nod_ committed f2eb0f52 on 10.3.x 
    Revert "Issue #3428614 by catch, nod_, longwave: Resync .gitlab-ci.yml...
nod_’s picture

nod_
Primary language French
Location Lille
commented
Version: 10.3.x-dev » 10.4.x-dev
Status: Fixed » Needs work

can be improved to make cherry pick possible

nod_ reopened merge request !8950

nod_’s picture

nod_
Primary language French
Location Lille
commented
Status: Needs work » Reviewed & tested by the community
nod_’s picture

nod_
Primary language French
Location Lille
commented

so we can't cherry pick directly but git can figure out the conflicts by itself now

  • nod_ committed b26e834e on 10.3.x 
    Issue #3428614 by catch, nod_, longwave: Resync .gitlab-ci.yml and ....

  • nod_ committed 19c608d5 on 10.4.x 
    Issue #3428614 by catch, nod_, longwave: Resync .gitlab-ci.yml and ....

nod_ closed merge request !8950

nod_’s picture

nod_
Primary language French
Location Lille
commented
Version: 10.4.x-dev » 10.3.x-dev
Status: Reviewed & tested by the community » Fixed

patch still looking good after sleeping a bit on it

Status: Fixed » Closed (fixed)

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