Repository navigation
Make the Mergify queue rebase PRs in place before merging - #303
Merged
Merged
Conversation
The queue tested Renovate PRs on a draft PR and merged the originals without rebasing them (#262), because update_method only applies to in-place checks. Mergify only checks in place with max_parallel_checks: 1 and no separate merge_conditions, so move the build check into queue_conditions. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Codex Review SummaryThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
Contributor
|
This pull request does not currently match the merge queue conditions, so it cannot be queued from here. The box comes back if it matches again. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
#299 set
update_method: rebase+merge_method: mergefor semi-linear history, but #262 landed un-rebased: Mergify tested it on draft #302 (main+ a merge of #262) and then merged the original PR on its old base.Per Mergify's docs,
update_methodis the "method to use to update the pull request with its base branch when the check is done in place" (queue rules). In-place checks only happen when (batches: in-place checks):batch_size = 1(default)merge_queue.max_parallel_checks = 1(default is 5)max_checks_retries = 0(default)merge_conditionsbeyondqueue_conditions(Auto-merge Renovate PRs through the Mergify merge queue #299 hadcheck-success = buildinmerge_conditions)This sets
max_parallel_checks: 1and movescheck-success = buildintoqueue_conditions, as in the docs' fast-forward example.Resulting flow: a Renovate PR enters the queue once its
buildpasses. Mergify then rebases it ontomainin place,buildruns again on the rebased PR, and once it passes Mergify merges it with a merge commit.Consequences:
buildruns twice per PR (entry, then after the rebase), unless the PR is already on currentmain.buildcheck, so they need a rebase (Renovate's checkbox or@Mergifyio rebase) before they can enter the queue.Not yet verified on a real PR. No
update_bot_accountis set. The docs require one for in-place updates only for fork PRs opened by another app's bot or changing workflows, while Renovate's branches are in this repo.🤖 Generated with Claude Code