From fc2051351713355e48e1f926f36015360753d0d7 Mon Sep 17 00:00:00 2001
From: systemfsoftware-maker
 <248545757+systemfsoftware-maker@users.noreply.github.com>
Date: Wed, 11 Nov 2026 02:00:25 +0000
Subject: [PATCH] fix(ci): queue approved pull requests on master

The org rule "Queue when approved" in systemfsoftware/.github matches
base = main. This repository's default branch is master, so an approval
never queued a PR; it needed a manual @Mergifyio queue comment.

Add a rule of the same name with the org rule's conditions, base = master
in place of base = main. Mergify keeps the local rule when both files name
one, so the rest of the org policy still applies. `shared` anchors are not
inherited, so the two the rule uses are copied locally.
---
 .mergify.yml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/.mergify.yml b/.mergify.yml
index 1c307dc2..d7a5f7f1 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,5 +1,9 @@
-# Mergify: policy lives in systemfsoftware/.github (.mergify.yml). This file only names this repo's CI checks.
+# Mergify: policy lives in systemfsoftware/.github (.mergify.yml). This file names this repo's CI checks and the one rule that cannot be inherited: this repo's default branch is master.
 extends: .github
+shared:
+  # Copied from the org file; `shared` is not inherited. Keep in step with its kiro_gate phase switch.
+  kiro_gate: &kiro_gate "approved-reviews-by = kiro-systemf[bot]"
+  not_queue_branch: &not_queue_branch "-head ~= ^mergify/merge-queue/"
 queue_rules:
   - name: default
     # Checked on the PR itself before it enters the queue.
@@ -14,3 +18,15 @@ queue_rules:
     merge_conditions:
       - check-success = gate / gate
       - check-success = nix flake check
+pull_request_rules:
+  # Same name and conditions as the org rule, which matches base = main; a local rule of the same name replaces it.
+  - name: Queue when approved
+    conditions:
+      - base = master
+      - *not_queue_branch
+      - *kiro_gate
+      - "#changes-requested-reviews-by = 0"
+      - -draft
+      - -label = hold
+    actions:
+      queue: