From 5c3134f76def48011239563ff8dcb3e08d06acff Mon Sep 17 00:00:00 2001
From: Den <53200638+localden@users.noreply.github.com>
Date: Fri, 1 Nov 2024 13:31:44 -0700
Subject: [PATCH] Update policies

---
 .github/policies/auto-label-pr.yml  | 10 +++++++++-
 .github/policies/scheduled-sync.yml |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.github/policies/auto-label-pr.yml b/.github/policies/auto-label-pr.yml
index ef7480de..5fe5f7af 100644
--- 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'
\ No newline at end of file
+          label: ':octocat: auto-merge'
+      - enableAutoMerge:
+            mergeMethod: Squash
+      - approvePullRequest:
+          comment: "Approved; this PR will merge when all status checks pass."
\ No newline at end of file
diff --git a/.github/policies/scheduled-sync.yml b/.github/policies/scheduled-sync.yml
index 06d6f6a7..96e77efc 100644
--- 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: