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.

Sign up for GitHub

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

Jump to bottom

[core] Clarify the release strategy #16012

Merged
merged 1 commit into from
Dec 27, 2024
Merged

[core] Clarify the release strategy #16012

merged 1 commit into from
Dec 27, 2024

Conversation

MBilalShafi
Copy link
Member

@MBilalShafi MBilalShafi added docs Improvements or additions to the documentation core Infrastructure work going on behind the scenes needs cherry-pick The PR should be cherry-picked to master after merge labels Dec 27, 2024
@MBilalShafi MBilalShafi requested a review from a team December 27, 2024 14:51
@MBilalShafi MBilalShafi mentioned this pull request Dec 27, 2024
Merged
@mui-bot
Copy link

mui-bot commented Dec 27, 2024

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

Generated by 🚫 dangerJS against a29e286

@DanailH
Copy link
Member

DanailH commented Dec 27, 2024

We need to port the same cange for master

@MBilalShafi
Copy link
Member Author

MBilalShafi commented Dec 27, 2024 •
edited
Loading

We need to port the same cange for master

Yes I guess needs cherry-pick label would make the GitHub Action handle it, unless there are merge conflicts.

@LukasTy LukasTy changed the title [core] Document new release strategy [core] Clarify the release strategy Dec 27, 2024
@LukasTy LukasTy added the v7.x label Dec 27, 2024
@LukasTy
Copy link
Member

LukasTy commented Dec 27, 2024

Yes I guess needs cherry-pick label would make the GitHub Action handle it, unless there are merge conflicts.

Without v7.x, no, it wouldn't. 🙈

@MBilalShafi
Copy link
Member Author

@michelengelen Correct me if I'm wrong here but I didn't add v7.x label as I assumed it'd make the script think that this PR needs to be cherry-picked on v7.x branch and it won't get opened on master.

@michelengelen
Copy link
Member

@michelengelen Correct me if I'm wrong here but I didn't add v7.x label as I assumed it'd make the script think that this PR needs to be cherry-picked on v7.x branch and it won't get opened on master.

Yes, without this it will open a PR to master.

@michelengelen
Copy link
Member

Yes I guess needs cherry-pick label would make the GitHub Action handle it, unless there are merge conflicts.

Without v7.x, no, it wouldn't. 🙈

if you have a PR targeting master and add version labels (v7.x or v6.x) it will open a cherry pick PR to these branches, but if you have a PR targeting a version branch the default action is to open a cherry pick PR to master

@MBilalShafi MBilalShafi merged commit 83db901 into mui:v7.x Dec 27, 2024
22 checks passed
@MBilalShafi MBilalShafi deleted the update-readme branch December 27, 2024 15:49
MBilalShafi added a commit to MBilalShafi/mui-x that referenced this pull request Dec 27, 2024
@MBilalShafi
[core] Clarify the release strategy (mui#16012)
788ae5e
@MBilalShafi MBilalShafi mentioned this pull request Dec 27, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LukasTy LukasTy LukasTy approved these changes

@DanailH DanailH DanailH approved these changes

Assignees
No one assigned
Labels
core Infrastructure work going on behind the scenes docs Improvements or additions to the documentation needs cherry-pick The PR should be cherry-picked to master after merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@MBilalShafi @mui-bot @DanailH @LukasTy @michelengelen