diff --git a/.mergify.yml b/.mergify.yml index 2d967d1..a2f1f5d 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,8 +1,8 @@ +# WARNING: auto_merge applies globally to all queue rules. The following queue rules did NOT have autoqueue enabled and will now also auto-queue: 'default'. Review your queue_conditions to ensure this is the desired behavior. queue_rules: # Dosubot: only needs quality (fmt + clippy) to pass - name: dosubot merge_method: squash - autoqueue: true queue_conditions: - author = dosubot[bot] - base = main @@ -12,7 +12,6 @@ queue_rules: # Dependabot: full CI required - name: dependabot merge_method: squash - autoqueue: true queue_conditions: - author = dependabot[bot] - base = main @@ -86,9 +85,7 @@ merge_protections: - author != dependabot[bot] - author != dosubot[bot] success_conditions: - - "title ~= - ^(fix|feat|docs|style|refactor|perf|test|build|ci|chore|revert)(?:\\(.+\ - \\))?:" + - "title ~= ^(fix|feat|docs|style|refactor|perf|test|build|ci|chore|revert)(?:\\(.+\\))?:" - name: Full CI must pass description: All CI checks must pass. This protection prevents manual merges that bypass the merge queue. @@ -113,3 +110,6 @@ merge_protections: - base = main success_conditions: - "#commits-behind <= 10" +merge_protections_settings: + auto_merge: true + reporting_method: check-runs