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

Implement rolling upstream updates #1936

Open

AndrewL97 opened this issue Dec 21, 2021 · 1 comment

Assignees

Collaborator

AndrewL97 commented Dec 21, 2021 •

edited

Loading

Mirror-bot is unsustainable for our small team (Kosh is the only person doing it, because he beautiful man)

New solution

New branch - "Upstream-Staging"
Every month (week if PR is automated):

Merge Master into Upstream-Staging
Pull TG into Upstream-Staging, with full commit history.
Fix any conflicts and hopefully catch any bugs that arise
Tag Master branch with format YY.MM.AB.R (Year, month, Alpha/Beta, Revision)- i.e 21.12.A.2 is the second revision for the alpha release, in December 2021
Make a PR from Upstream-Staging to Master, SQUASH (full history is kept in U-S branch)

To get to this stage, we need to

Nuke Mirror-Bot
Nuke Mirror PRs
Configure Github Actions for rolling weekly updates (optional)
- This should make instability more manageable
Hopefully nothing else

AndrewL97 self-assigned this

Collaborator Author

AndrewL97 commented Dec 21, 2021

@Koshenko FYI, ticket for visibility
Will aim to get this done first thing in the morning - work Christmas party tonight 🥳

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