action #76738
open[workflow] Automatically rebase openQA PRs
0%
Description
Motivation¶
Although we usetried out Mergify to rebase branches¹ before merging by default, this only applies when there's already two approvals and all tests pass. Unrelated failures that are fixed in another branch or dependency updates will leave such PRs in a failed state that requires a manual rebase.
We could save time checking the state of branches if branches were be rebased automatically².
Suggestions¶
- Use a GitHub action to automatically rebase outdated branches https://github.com/marketplace/actions/auto-rebase
- Consider labels to decide if branches should be rebased
- ¹ Mergify wasn't working very well as-is: https://github.com/os-autoinst/openQA/pull/3585
- ² There are other actions that implement "automatic rebases" and the same phrasing is sometimes used to mean rebase triggered by writing a special comment. This ticket is about behavior that requires no human intervention.
Updated by okurz over 3 years ago
- Priority changed from Normal to Low
- Target version set to Ready
Updated by okurz about 2 years ago
- Subject changed from Automatically rebase openQA PRs to [workflow] Automatically rebase openQA PRs
By the way, one can trigger a "semi-automatic rebase" by simply responding with a comment on github stating @Mergifyio rebase and it will rebase. For automatic rebasing mergify has the action "rebase" in https://docs.mergify.com/actions/rebase/ which is not the same as the strict merge we tried in https://github.com/os-autoinst/openQA/pull/3452 . We could think of conditions that define a situation where we want to rebase automatically which will trigger new tests in the rebased state and keep the approval so I consider it quite safe.