-
Notifications
You must be signed in to change notification settings - Fork 110
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
MNT Run module-standardiser #805
MNT Run module-standardiser #805
Conversation
3a45601
to
51bf743
Compare
51bf743
to
d8c9696
Compare
I have some questions about silverstripe/gha-merge-up. Is there some human readable description of what https://github.com/silverstripe/gha-merge-up does exactly? |
This isn't going to go over all the old branches from ~10 years ago and try to merge these up is it? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Temporarily blocking merge until we can confirm what this new process will do.
gha-merge-up will attempt to automatically merge-up from the latest minor branch on the previous supported major (in the case of fluent that will be 6) all the way through to the next-minor branch on the current major. It runs on a weekly cron. It's pretty conservative and will fail the github action if there are merge-conflicts, unless they are in client/dist in which case it will run yarn build In the case of silverstripe/framework it will currently merge-up 4.13 -> 4 -> 5.0 -> 5 You can have a look to see what the job looks like in action here
No it won't. I'm not sure what the scope of differences are between fluent 6 and 7. If you think this is unrealistic or just a bad idea for fluent then we would add an exception to gha-merge-up to only merge-up on the most recent supported major i.e. currently only merge-up from 7.0 -> 7 Does this new process seem OK to you? |
Lets give it a go and I'll keep an eye on it :) |
IMPORTANT:
@tractorcow FYI it's also possible that because the default branch isn't following our expected branching strategy that this workflow will just flat out fall apart for this module. |
This pull-request was created automatically by module-standardiser