fix auto-merge policy

gewarren · May 21, 2024 · ed8e9e5 · ed8e9e5
1 parent 82545c2
commit ed8e9e5
Showing 1 changed file with 21 additions and 7 deletions.
diff --git a/.github/policies/auto-merge.yml b/.github/policies/auto-merge.yml
@@ -8,7 +8,9 @@ where:
 configuration:
   resourceManagementConfiguration:
     eventResponderTasks:
-    - if:
+    - description: Auto-squash-merge PRs to main labeled with auto-merge
+      triggerOnOwnActions: true
+      if:
       - payloadType: Pull_Request
       - labelAdded:
           label: ':octocat: auto-merge'
@@ -17,9 +19,23 @@ configuration:
       then:
       - enableAutoMerge:
           mergeMethod: Squash
+    - description: Auto-merge PRs to live with title "Merge main into live"
       triggerOnOwnActions: true
-      description: Auto-squash-merge PRs to main labeled with auto-merge
-    - if:
+      if:
+      - payloadType: Pull_Request
+      - isAction:
+          action: Opened
+      - titleContains:
+          pattern: Merge main into live
+          isRegex: False
+      - targetsBranch:
+          branch: live
+      then:
+      - enableAutoMerge:
+          mergeMethod: Merge
+    - description: Auto-merge PRs to live labeled with auto-merge
+      triggerOnOwnActions: true
+      if:
       - payloadType: Pull_Request
       - labelAdded:
           label: ':octocat: auto-merge'
@@ -28,12 +44,10 @@ configuration:
       then:
       - enableAutoMerge:
           mergeMethod: Merge
-      triggerOnOwnActions: true
-      description: Auto-merge PRs to live labeled with auto-merge
-    - if:
+    - description: Don't auto-merge PRs with auto-merge label removed
+      if:
       - payloadType: Pull_Request
       - labelRemoved:
           label: ':octocat: auto-merge'
       then:
       - disableAutoMerge
-      description: Don't auto-merge PRs with auto-merge label removed