ci(sync-branch): allow PR to auto-merge#14967
Conversation
|
Can you give a brief description what is the desired workflow for this PR? Does is bypass the requirements for a manual review? In case of merging 2.5 and 2.6 we should keep the manual confirmation step. There are many reasons where the a git merge succeeds but the result is wrong. If this would be an automatic process it will land into main without a chance to stop this. A recent example where even the manual merge was not correct was this: #14949 |
The desired workflow would be for the automation to merge forward fixes on past release to the N+1 release, after all CI has validated it works well (all checks passes)
Yes it does. I'm only suggesting that as this is something we already do, via a merge straight to the N+1 release branch (such as 487ed0c or ffe31e3). Do you think it would still be best to manually review? I could also add a timer, so the auto merge only happens after 48h for example. This way, it gives sometime to intervene if something isn't meant to be merged, but also we eventually keep thing in sync |
|
not sure if the auto merge for that is really a super great idea actually. The workflow envisioned for auto merge (as in the "enable auto-merge" button in the GUI) was just for the case where I had just reviewed a PR and CI is still running. Then I can give the LGTM and it gets automatically merged once CI succeeds. A similar workflow is also reasonable for the branch syncing PRs. |
Yes. The automatic merge branch is a nice feature to create a build and run checks, but it should not merge automatically with at least a plausibility check, or ideally a manual smoke test. Keep in mind that we want to give a kind of "stable" guarantee even for alpha and beta and that does not work if all core members are absent and something went wrong. |
3 participants
Depends of #14964