From 9875ccf4e62fb5a26e54f712e192647293bf646b Mon Sep 17 00:00:00 2001
From: Diego Rodrigues de Sa e Souza
 <8016841+diegosouzapw@users.noreply.github.com>
Date: Wed, 15 Jul 2026 00:48:07 -0300
Subject: [PATCH] fix(ci): merge queue tolerates the advisory dast-smoke
 failure (its GH-hosted build hang dequeued every attempt) (#7225)

---
 .mergify.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.mergify.yml b/.mergify.yml
index f7cbe19d7e..7cc4882127 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -41,7 +41,14 @@ queue_rules:
     # is intentionally NOT a condition here: the owner-applied `queue` label IS the
     # approval in this repo's single-maintainer model (see governance header).
     merge_conditions:
-      - "#check-failure=0"
+      # "Zero failures" — EXCEPT the advisory dast-smoke: it is continue-on-error by
+      # design and its GH-hosted CLI build hangs recurrently (drafts #7184/#7221 were
+      # dequeued solely by it). Any OTHER failure still blocks (anti-fail-open kept).
+      - or:
+          - "#check-failure=0"
+          - and:
+              - "#check-failure=1"
+              - check-failure=dast-smoke
       - "#check-pending=0"
       - "#check-success>=1"
       - check-success=Merge integrity (changelog + generated skills)