Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[infra] Reintroduce the cherry pick workflow #15293

Conversation

michelengelen
Copy link
Member

added a change that should fix the workflow

@michelengelen michelengelen added the scope: infra Org infrastructure work going on behind the scenes label Nov 6, 2024
@michelengelen michelengelen self-assigned this Nov 6, 2024
@michelengelen michelengelen enabled auto-merge (squash) November 6, 2024 08:56
@mui-bot
Copy link

mui-bot commented Nov 6, 2024

Deploy preview: https://deploy-preview-15293--material-ui-x.netlify.app/

Generated by 🚫 dangerJS against 0fd19af

Copy link
Member

@LukasTy LukasTy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's try it. 👍

@michelengelen michelengelen merged commit 2304191 into mui:master Nov 6, 2024
19 of 20 checks passed
@michelengelen michelengelen deleted the automation/revert-back-cherry-pick-pr branch November 6, 2024 09:29
branches:
- 'v*.x'
- 'master'
types: ['closed']
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@michelengelen Do you think we can make cherry-pick possible after the PR was merged, but didn't have the "needs cherry-pick" label?
Take this PR for example: #15255 It was merged, and then we realized we want to cherry-pick it to v7. Since it's already merged, adding the "needs cherry-pick" label is too late.

Ideally, we would have 2 triggers for cherry-pick:

  1. PR is merged and has the "needs cherry-pick" label
  2. Label is added to the PR, the PR now has the "needs cherry-pick" label, and it's already merged.

What do you think?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a great idea. 👍
It might prove slightly tricky to use because we would probably need to ensure the proper vX.x labels are added before adding the needs cherry-pick label. 🤔

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's already on my list! But good observation! 💪🏻👍🏼

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

An alternative is to have a manual workflow_dispatch, with a required PR # to cherrypick and target

uses: mui/mui-public/.github/workflows/prs_create-cherry-pick-pr.yml@master
permissions:
contents: write
issues: write
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks suspicious: mui/mui-public#245

Suggested change
issues: write

#15456 opened

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
scope: infra Org infrastructure work going on behind the scenes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants