Skip to content

merge queue: checking main (c6d3035) and #12274 together #12280

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.

Sign up for GitHub

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

Closed
mergify wants to merge 2 commits into from
Closed

merge queue: checking main (c6d3035) and #12274 together #12280

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ac1c1e
ci: require two approvals on docs-agent pull requests
jd Jul 30, 2026
5c87259
Merge of #12274
mergify[bot] Jul 31, 2026
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
25 changes: 21 additions & 4 deletions .mergify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,11 @@ merge_protections:
- or: &DefaultReviewCond
- "#approved-reviews-by >= 2"
- author = dependabot[bot]
- author = mergify-ci-bot
# mergify-ci-bot needs no approval for the deterministic syncers, but
# the docs agent writes prose under docs-agent/* and gets no free pass.
- and:
- author = mergify-ci-bot
- "-head ~= ^docs-agent/"

- name: 🧑‍🚒 Hotfix Review Requirements
if:
Expand Down Expand Up @@ -81,8 +85,13 @@ queue_rules:
- name: default
<<: *DefaultQueueOptions
queue_conditions:
- author != mergify-ci-bot
- author != dependabot[bot]
# docs-agent branches are excluded from the automated updates lane below,
# so they have to land here or they would match no queue at all.
- or:
- and:
- author != mergify-ci-bot
- author != dependabot[bot]
- head ~= ^docs-agent/
merge_conditions:
- schedule=Mon-Fri 09:00-17:30[Europe/Paris]

Expand All @@ -93,14 +102,22 @@ queue_rules:
- or:
- author = mergify-ci-bot
- author = dependabot[bot]
- "-head ~= ^docs-agent/"
batch_size: 10
batch_max_wait_time: 5min

pull_request_rules:
- name: request review
conditions:
- -author=dependabot[bot]
- -author=mergify-ci-bot
# Bots are not routed for review, except the docs agent, which now needs
# two approvals like anyone else. Gated on -draft so the ten drafts a
# Monday audit opens do not each ping the team before a human wants them.
- or:
- -author=mergify-ci-bot
- and:
- head ~= ^docs-agent/
- -draft
- -merged
- -closed
- and: *CheckRuns
Expand Down