Check author before auto-merging (#9961)

dotnet · May 30, 2024 · e9ca28a · e9ca28a
1 parent b4d3208
commit e9ca28a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 28 deletions.
diff --git a/.github/policies/auto-merge.yml b/.github/policies/auto-merge.yml
@@ -1,14 +1,13 @@
-id:
 name: GitOps.PullRequestIssueManagement
 description: GitOps.PullRequestIssueManagement primitive
-owner:
 resource: repository
-disabled: false
-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 +16,10 @@ configuration:
       then:
       - enableAutoMerge:
           mergeMethod: Squash
+
+    - description: Auto-merge PRs to live labeled with auto-merge
       triggerOnOwnActions: true
-      description: Auto-squash-merge PRs to main labeled with auto-merge
-    - if:
+      if:
       - payloadType: Pull_Request
       - labelAdded:
           label: ':octocat: auto-merge'
@@ -28,26 +28,11 @@ configuration:
       then:
       - enableAutoMerge:
           mergeMethod: Merge
-      triggerOnOwnActions: true
-      description: Auto-merge PRs to live labeled with auto-merge
-    - if:
-      - payloadType: Pull_Request
-      - isAction:
-          action: Opened
-      - titleContains:
-          pattern: Merge main into live
-          isRegex: False
-      - targetsBranch:
-          branch: live
-      then:
-      - enableAutoMerge:
-          mergeMethod: Merge
-      triggerOnOwnActions: true
-      description: Auto-merge PRs to live with title "Merge main into live"
-    - 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
diff --git a/.github/policies/label-prs.yml b/.github/policies/label-prs.yml
@@ -5,17 +5,18 @@ resource: repository
 configuration:
   resourceManagementConfiguration:
     eventResponderTasks:
-    - if:
+    - description: Label publish PRs with auto-merge
+      if:
       - payloadType: Pull_Request
       - isAction:
           action: Opened
+      - isActivitySender:
+          user: dotnet-policy-service[bot]
       - titleContains:
           pattern: Merge main into live
           isRegex: False
       then:
       - addLabel:
           label: ':octocat: auto-merge'
-      description: Label main to live PRs
-      triggerOnOwnActions: true