From 5b88c6139dbce195f6bbc7ccec2f449fc438becb Mon Sep 17 00:00:00 2001 From: UncleSp1d3r Date: Sun, 15 Feb 2026 18:59:00 -0500 Subject: [PATCH] ci(Mergify): configuration update Signed-off-by: UncleSp1d3r --- .mergify.yml | 83 +++++++++++++++++++++------------------------------- 1 file changed, 34 insertions(+), 49 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 8a04dbef..6ed03afe 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,60 +1,45 @@ -queue_rules: - - name: default - merge_method: squash - merge_conditions: - - check-success = quality - - check-success = test - - "check-success = test-cross-platform (ubuntu-latest, Linux)" - - "check-success = test-cross-platform (ubuntu-22.04, Linux)" - - "check-success = test-cross-platform (macos-latest, macOS)" - - "check-success = test-cross-platform (windows-latest, Windows)" - - check-success = coverage - -pull_request_rules: - - name: Queue PRs when approved - conditions: - - base = main - - "#approved-reviews-by >= 1" - - label != do-not-merge - actions: - queue: - name: default - - - name: Auto-queue release-plz PRs - conditions: - - base = main - - "head ~= ^release-plz-" - actions: - queue: - name: default - - - name: Auto-queue dependabot PRs - conditions: - - base = main - - author = dependabot[bot] - actions: - queue: - name: default - merge_protections: - name: CI must pass - description: >- - All CI checks must pass. This protection prevents manual merges - that bypass the merge queue. + description: All CI checks must pass or be legitimately skipped (path + filtering). Matrix job names differ between running and skipped states, so + the test-cross-platform rule uses an and/or pattern to handle both. if: - base = main success_conditions: - - check-success = quality - - check-success = test - - "check-success = test-cross-platform (ubuntu-latest, Linux)" - - "check-success = test-cross-platform (ubuntu-22.04, Linux)" - - "check-success = test-cross-platform (macos-latest, macOS)" - - "check-success = test-cross-platform (windows-latest, Windows)" - - check-success = coverage - + - or: + - check-success = quality + - check-skipped = quality + - or: + - check-success = test + - check-skipped = test + - or: + - and: + - check-success = test-cross-platform (ubuntu-latest, Linux) + - check-success = test-cross-platform (ubuntu-22.04, Linux) + - check-success = test-cross-platform (macos-latest, macOS) + - check-success = test-cross-platform (windows-latest, Windows) + - check-skipped = test-cross-platform + - or: + - check-success = coverage + - check-skipped = coverage - name: Do not merge outdated PRs description: Make sure PRs are within 10 commits of the base branch before merging if: - base = main success_conditions: - "#commits-behind <= 10" +priority_rules: + - name: Bot Generated + priority: low + conditions: + - and: + - author = dependabot[bot] + - base = main + allow_checks_interruption: true + - name: Bug Fixes + priority: high + conditions: + - and: + - "title ~= ^bug(\\\\(.*\\\\))?:" + - base = main + allow_checks_interruption: true