Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
queue_rules:
- name: default
merge_conditions:
- check-success = build
# Semi-linear history: rebase the PR onto main, then merge it with a merge commit
update_method: rebase

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Configure the queue so the requested rebase actually occurs

update_method: rebase only updates branches when Mergify performs in-place checks, but this queue uses a separate merge_conditions phase and leaves merge_queue.max_parallel_checks at its default of 5, so Mergify instead tests a temporary batch PR and then merges the original, unre颅based PR head. Consequently, a Renovate PR created from an older main produces ordinary branching history rather than the semi-linear history promised by the comment. Mergify documents both the in-place-check requirements and that update_method applies to in-place updates; either make the queue eligible for in-place checks or select a method that lands the tested batch branch.

Useful? React with 馃憤聽/ 馃憥.

merge_method: merge

pull_request_rules:
- name: Queue Renovate pull requests
conditions:
- author = renovate[bot]
actions:
queue:
name: default
6 changes: 0 additions & 6 deletions renovate.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
{
"extends": [
"config:base"
],
"packageRules": [
{
"matchUpdateTypes": ["minor", "patch", "pin", "digest"],
"automerge": true
}
]
}
Loading