From c7d4f8b6d719799b9740220d811916433ff36229 Mon Sep 17 00:00:00 2001 From: Ryan Lee Date: Sun, 18 Oct 2026 02:14:58 -0400 Subject: [PATCH 1/4] ci(mergify): extend the org merge-queue policy and name this repo's checks Co-Authored-By: Claude Opus 5.5 --- .mergify.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .mergify.yml diff --git a/.mergify.yml b/.mergify.yml new file mode 100644 index 00000000..5026fe21 --- /dev/null +++ b/.mergify.yml @@ -0,0 +1,15 @@ +# Mergify: policy lives in systemfsoftware/.github (.mergify.yml). This file only names this repo's CI checks. +extends: .github +queue_rules: + - name: default + # Checked on the PR itself before it enters the queue. + queue_conditions: + - check-success = checks / the gate + - or: + - check-success = check / a publishable-package change needs an intent + - check-skipped = check / a publishable-package change needs an intent + - check-success = Same bytes on every host + # Checked on Mergify's queue draft PR (mergify/merge-queue/*), i.e. CI on the PR rebased with main and any batch. + merge_conditions: + - check-success = checks / the gate + - check-success = Same bytes on every host From db5b98e08ff4bbcf7783b18a21215d1aae6abd5a Mon Sep 17 00:00:00 2001 From: Ryan Lee Date: Sun, 18 Oct 2026 02:26:17 -0400 Subject: [PATCH 2/4] ci(mergify): require the Kiro gate to queue and to merge Co-Authored-By: Claude Opus 5.5 --- .mergify.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.mergify.yml b/.mergify.yml index 5026fe21..250af7dc 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -4,6 +4,10 @@ queue_rules: - name: default # Checked on the PR itself before it enters the queue. queue_conditions: + # Kiro merge authority: only a Kiro approval or the review-gate check run (posted by kiro-systemf) lets a PR queue. + - or: + - check-success = review-gate + - approved-reviews-by = kiro-systemf[bot] - check-success = checks / the gate - or: - check-success = check / a publishable-package change needs an intent @@ -11,5 +15,8 @@ queue_rules: - check-success = Same bytes on every host # Checked on Mergify's queue draft PR (mergify/merge-queue/*), i.e. CI on the PR rebased with main and any batch. merge_conditions: + - or: + - check-success = review-gate + - approved-reviews-by = kiro-systemf[bot] - check-success = checks / the gate - check-success = Same bytes on every host From 46ee6751f080ae89e1d33bca382cea59d28e9a24 Mon Sep 17 00:00:00 2001 From: systemfsoftware-maker <248545757+systemfsoftware-maker@users.noreply.github.com> Date: Sat, 24 Oct 2026 03:35:27 -0400 Subject: [PATCH 3/4] ci: group Dependabot minor and patch updates and drop the per-repo review gate Dependabot patch and minor updates merge under the org policy; majors keep the review gate. --- .mergify.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 250af7dc..a37a5fa4 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -5,9 +5,6 @@ queue_rules: # Checked on the PR itself before it enters the queue. queue_conditions: # Kiro merge authority: only a Kiro approval or the review-gate check run (posted by kiro-systemf) lets a PR queue. - - or: - - check-success = review-gate - - approved-reviews-by = kiro-systemf[bot] - check-success = checks / the gate - or: - check-success = check / a publishable-package change needs an intent @@ -15,8 +12,5 @@ queue_rules: - check-success = Same bytes on every host # Checked on Mergify's queue draft PR (mergify/merge-queue/*), i.e. CI on the PR rebased with main and any batch. merge_conditions: - - or: - - check-success = review-gate - - approved-reviews-by = kiro-systemf[bot] - check-success = checks / the gate - check-success = Same bytes on every host From eabdafa4d74aaad7b061372407f57ca83a0c4819 Mon Sep 17 00:00:00 2001 From: systemfsoftware-maker <248545757+systemfsoftware-maker@users.noreply.github.com> Date: Sat, 24 Oct 2026 03:36:06 -0400 Subject: [PATCH 4/4] ci(mergify): let Dependabot patch and minor updates queue without the Kiro approval --- .mergify.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.mergify.yml b/.mergify.yml index a37a5fa4..d60209f0 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -4,7 +4,16 @@ queue_rules: - name: default # Checked on the PR itself before it enters the queue. queue_conditions: - # Kiro merge authority: only a Kiro approval or the review-gate check run (posted by kiro-systemf) lets a PR queue. + - or: + - check-success = review-gate + - approved-reviews-by = kiro-systemf[bot] + - and: + - author = dependabot[bot] + - dependabot-update-type != version-update:semver-major + - or: + - dependabot-update-type = version-update:semver-patch + - dependabot-update-type = version-update:semver-minor + - "title ~= (?i)\\bthe [a-z0-9@/._-]*(minor|patch)[a-z0-9@/._-]* group\\b" - check-success = checks / the gate - or: - check-success = check / a publishable-package change needs an intent