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

[core] Add cherry-pick master to v6 action #12648

Merged
merged 2 commits into from
Apr 4, 2024

Conversation

LukasTy
Copy link
Member

@LukasTy LukasTy commented Apr 3, 2024

Add an action, which would cherry-pick a PR merged to master into a v6.x branch if it would have a needs cherry-pick label.

Could be useful for bug fixes during the v7 development / v6 maintenance mode.

@LukasTy LukasTy added the core Infrastructure work going on behind the scenes label Apr 3, 2024
@LukasTy LukasTy requested review from MBilalShafi and a team April 3, 2024 11:59
@LukasTy LukasTy self-assigned this Apr 3, 2024
@mui-bot
Copy link

mui-bot commented Apr 3, 2024

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

Generated by 🚫 dangerJS against ca3111d

permissions:
pull-requests: write
contents: write
if: ${{ contains(github.event.pull_request.labels.*.name, 'needs cherry-pick') && contains(github.event.pull_request.labels.*.name, 'v6.x') && github.event.pull_request.merged == true }}
Copy link
Member

Choose a reason for hiding this comment

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

do we really need the v6.x label? Seems like 99.9% of PRs will be on master and when a cherry pick is needed we only add it to v6 anyways, right?

Copy link
Member Author

Choose a reason for hiding this comment

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

No, technically we don't need it.
I've added the extra check just to have the maximum specificity.
If we agree, then it could just be the same as for next -> master, simply adding a needs cherry-pick label would cherry-pick the PR to v6.x.

Copy link
Member

Choose a reason for hiding this comment

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

IMHO I would be in favor of that

Copy link
Member Author

Choose a reason for hiding this comment

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

Removed the extra check. 😉

Copy link
Member

@MBilalShafi MBilalShafi left a comment

Choose a reason for hiding this comment

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

Thanks Lukas, I was thinking about backporting a couple of PRs, this workflow will help speed it up 🚀

@LukasTy LukasTy merged commit 5c35a4b into mui:master Apr 4, 2024
17 checks passed
@LukasTy LukasTy deleted the cherry-pick-to-v6-action branch April 4, 2024 05:16
joakimtveter pushed a commit to joakimtveter/mui-x that referenced this pull request Jun 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core Infrastructure work going on behind the scenes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants