Skip to content

Workflows: Remove cherry-pick label and add failure label on conflict#76586

Open
Bingtagui404 wants to merge 1 commit intoWordPress:trunkfrom
Bingtagui404:fix/76157-remove-cherry-pick-label-on-failure
Open

Workflows: Remove cherry-pick label and add failure label on conflict#76586
Bingtagui404 wants to merge 1 commit intoWordPress:trunkfrom
Bingtagui404:fix/76157-remove-cherry-pick-label-on-failure

Conversation

@Bingtagui404
Copy link

What?

Closes #76157

When the automatic cherry-pick workflow fails due to a conflict, remove the Backport to WP X.Y Beta/RC label and add a Backport Failed label.

Why?

Currently, when a cherry-pick fails, no modifications are made to the labels. This makes it hard to notice failures and difficult to retry (re-adding the label triggers a new attempt).

How?

Added a new step in the cherry-pick-wp-release.yml workflow that runs when conflict == 'true'. It mirrors the existing success-path label handling:

  • Removes the Backport to WP X.Y Beta/RC label
  • Adds the Backport Failed label

This step runs before the conflict comment step, so the label state is updated before the user is notified.

Testing Instructions

  1. This change only affects the GitHub Actions workflow file.
  2. To test, a cherry-pick conflict would need to occur on a PR with a Backport to WP X.Y Beta/RC label.
  3. Verify that after the conflict, the original label is removed and Backport Failed is added.

Use of AI Tools

This PR was authored with the assistance of Claude Code (AI coding assistant). The change was reviewed and validated by the contributor.

When the automatic cherry-pick fails due to a conflict, the
`Backport to WP X.Y Beta/RC` label is now removed and a
`Backport Failed` label is added. This makes failures more
visible and allows re-triggering by re-adding the label.

Closes WordPress#76157
@Bingtagui404 Bingtagui404 requested a review from desrosj as a code owner March 17, 2026 14:11
@github-actions
Copy link

The following accounts have interacted with this PR and/or linked issues. I will continue to update these lists as activity occurs. You can also manually ask me to refresh this list by adding the props-bot label.

Unlinked Accounts

The following contributors have not linked their GitHub and WordPress.org accounts: @Bingtagui404.

Contributors, please read how to link your accounts to ensure your work is properly credited in WordPress releases.

If you're merging code through a pull request on GitHub, copy and paste the following into the bottom of the merge commit message.

Unlinked contributors: Bingtagui404.

Co-authored-by: desrosj <desrosj@git.wordpress.org>

To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook.

@github-actions
Copy link

Warning: Type of PR label mismatch

To merge this PR, it requires exactly 1 label indicating the type of PR. Other labels are optional and not being checked here.

  • Required label: Any label starting with [Type].
  • Labels found: .

Read more about Type labels in Gutenberg. Don't worry if you don't have the required permissions to add labels; the PR reviewer should be able to help with the task.

@github-actions github-actions bot added the First-time Contributor Pull request opened by a first-time contributor to Gutenberg repository label Mar 17, 2026
@github-actions
Copy link

👋 Thanks for your first Pull Request and for helping build the future of Gutenberg and WordPress, @Bingtagui404! In case you missed it, we'd love to have you join us in our Slack community.

If you want to learn more about WordPress development in general, check out the Core Handbook full of helpful information.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

First-time Contributor Pull request opened by a first-time contributor to Gutenberg repository

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Remove cherry-pick label on when workflow fails to perform a merge

1 participant