Merge pull request #542 from MicrosoftDocs/localden/policy-fixes

Update policies
MicrosoftDocs · Nov 1, 2024 · f17ca4e · f17ca4e
2 parents 8e942a9 + 5c3134f
commit f17ca4e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/.github/policies/auto-label-pr.yml b/.github/policies/auto-label-pr.yml
@@ -22,6 +22,10 @@ configuration:
       then:
       - addLabel:
           label: ':octocat: auto-merge'
+      - enableAutoMerge:
+            mergeMethod: Squash
+      - approvePullRequest:
+          comment: "Approved; this PR will merge when all status checks pass."
     - description: Label publish PRs from the microsoft-github-policy-service bot
       triggerOnOwnActions: true
       if:
@@ -35,4 +39,8 @@ configuration:
           isRegex: False
       then:
       - addLabel:
-          label: ':octocat: auto-merge'
+          label: ':octocat: auto-merge'
+      - enableAutoMerge:
+            mergeMethod: Squash
+      - approvePullRequest:
+          comment: "Approved; this PR will merge when all status checks pass."
diff --git a/.github/policies/scheduled-sync.yml b/.github/policies/scheduled-sync.yml
@@ -17,10 +17,10 @@ configuration:
           base: main
           title: Merge smoke-test into main
           body: Please don't squash-merge this PR.
-    - description: Push to main branch (scheduled 1:30PM PT publish - used as test)
+    - description: Push to main branch (scheduled 1:35PM PT publish - used as test)
       frequencies:
       - daily:
-          time: 20:30
+          time: 20:35
       filters: []
       actions:
       - createPullRequest: