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

MNT Run module-standardiser #805

Conversation

emteknetnz
Copy link
Contributor

This pull-request was created automatically by module-standardiser

@emteknetnz emteknetnz force-pushed the pulls/7/module-standardiser-1691554779 branch from 51bf743 to d8c9696 Compare August 9, 2023 08:31
@tractorcow
Copy link
Collaborator

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?

@tractorcow
Copy link
Collaborator

This isn't going to go over all the old branches from ~10 years ago and try to merge these up is it?

Copy link
Collaborator

@tractorcow tractorcow left a 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.

@emteknetnz
Copy link
Contributor Author

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

This isn't going to go over all the old branches from ~10 years ago and try to merge these up is it?

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?

@tractorcow
Copy link
Collaborator

Lets give it a go and I'll keep an eye on it :)

@tractorcow tractorcow merged commit 2eac537 into tractorcow-farm:7 Aug 10, 2023
10 checks passed
@emteknetnz emteknetnz deleted the pulls/7/module-standardiser-1691554779 branch August 10, 2023 21:38
@GuySartorelli
Copy link
Contributor

GuySartorelli commented Aug 10, 2023

IMPORTANT: 7 isn't the default branch for this module, so this new workflow won't run unless:

  1. the default branch is swapped to be 7, OR
  2. this change is merged up to the current default branch

@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.

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

Successfully merging this pull request may close these issues.

3 participants