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

Branch both RC and Release from the "cut" commit #11

Open
TombWater opened this issue Jan 10, 2022 · 0 comments
Open

Branch both RC and Release from the "cut" commit #11

TombWater opened this issue Jan 10, 2022 · 0 comments

Comments

@TombWater
Copy link

We currently branch Release from the commit before the "cut" commit, and RC is branched from the "cut" commit. Because the base of these two branches differ, it's not possible to fast-forward merge RC to Release at the end of the testing cycle, and we end up with a merge commit having two parents. Those two parents make a more complicated history where it may be unclear where the release actually came from because the left parent will be the Main branch so the release version tag could be mistaken to be referring to the change before the "cut" commit.

We should change the automation to cut both the Release and RC branches from the "cut" commit.

We would then have the problem that if no fixes are done on RC then it wouldn't be possible to have a PR from RC to Release to run automations for the actual release when testing is done. That can be solved by having the cut-automation push an empty commit to RC immediately after creating it so that there's always guaranteed to be something on RC that can be merged to Release at the end.

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

No branches or pull requests

1 participant