mergify: auto-merge relbot PRs that target the main branch

2 years ago · 6bee719969
parent 7cbe730b8a
commit 6bee719969
1 changed files with 8 additions and 3 deletions
--- a/.mergify.yml
+++ b/.mergify.yml
@ -5,11 +5,16 @@ queue_rules:
        - status-success=complete-pr
        - and:
          # For more context, see "Auto Merge" rules down below
-          - base~=^releases[_/].*
          - status-success=complete-push
          - or:
-            - head~=^automation/sync-strings-\d+
-            - head~=^relbot/fenix-\d+
+            - and:
+              - base~=^releases[_/].*
+              - or:
+                - head~=^automation/sync-strings-\d+
+                - head~=^relbot/fenix-\d+
+            - and:
+              - base=main
+              - head~=^relbot/AC-Nightly-.+
 pull_request_rules:
  - name: Resolve conflict
    conditions: