Try adding an additional condition to catch AutoMerge not being enabl…

…ed (microsoft#142805)
stephengillie · Mar 7, 2024 · fb56c37 · fb56c37
1 parent 46924f3
commit fb56c37
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/.github/policies/automergeTriggers.yml b/.github/policies/automergeTriggers.yml
@@ -11,8 +11,11 @@ configuration:
       - description: Enable Auto Merge when the "Validation-Completed" label is present
         if:
           - payloadType: Pull_Request
-          - hasLabel:
-              label: Validation-Completed
+          - or:
+            - labelAdded:
+                label: Validation-Completed
+            - hasLabel:
+                label: Validation-Completed
         then:
           - enableAutoMerge:
               mergeMethod: Squash