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

Manual merge-ups required #240

Closed
GuySartorelli opened this issue May 7, 2024 · 4 comments
Closed

Manual merge-ups required #240

GuySartorelli opened this issue May 7, 2024 · 4 comments
Assignees

Comments

@GuySartorelli
Copy link
Member

Rhino shows a lot of repositories which don't have a merge-up workflow that need to have commits merged up.
https://rhino.silverstripe.org/?t=merge-ups

For recipes, if at all possible, run the cow merge up command (see the release process) as that was missed during the 5.2 release

For modules that aren't supported in CMS 5 but got a CMS 5 compatible release, do the merge-up if it's trivial, but if something will be tricky just make a comment in here - and maybe update rhino to not report it.

If there's anything that doesn't have a merge-up workflow but should, run module-standardiser (we're due for a run anyway) and make sure it gets added.

@emteknetnz emteknetnz self-assigned this May 7, 2024
@emteknetnz
Copy link
Member

I've manually merged up all the things that don't have a merge-up workflow from the current patch to next-minor to CMS 6

I was careful with the recipes to ensure that dependencies were not changed on merge-up from minor branch to next-minor branch

@emteknetnz
Copy link
Member

Not doing module-standardiser because we'd first need to update module-standardiser with updated workflow permissions -

@GuySartorelli
Copy link
Member Author

Reopening - rhino is still reporting a lot of merge-ups required.

@emteknetnz
Copy link
Member

emteknetnz commented May 7, 2024

I've dealt with the recipes. For all the other I've opened a new issue to run module-standardiser to ensure that all the modules have merge-ups workflows, and block it on the github permissions card

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

No branches or pull requests

2 participants