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

Policy update
MicrosoftDocs · Nov 1, 2024 · 31e5ef2 · 31e5ef2
2 parents 4524a80 + 1b50126
commit 31e5ef2
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 73 deletions.
diff --git a/.github/policies/auto-merge-sync-pr.yml b/.github/policies/auto-merge-sync-pr.yml
diff --git a/.github/policies/auto-label-pr.yml → .github/policies/handle-automatic-pr.yml b/.github/policies/auto-label-pr.yml → .github/policies/handle-automatic-pr.yml
@@ -8,7 +8,7 @@ where:
 configuration:
   resourceManagementConfiguration:
     eventResponderTasks:
-    - description: Label publish PRs from the microsoft-github-policy-service bot
+    - description: Sync API documentation to staging environment.
       triggerOnOwnActions: true
       if:
       - payloadType: Pull_Request
@@ -26,7 +26,7 @@ configuration:
           mergeMethod: Squash
       - approvePullRequest:
           comment: ':shipit:'
-    - description: Label publish PRs from the microsoft-github-policy-service bot
+    - description: Sync staging environment to production.
       triggerOnOwnActions: true
       if:
       - payloadType: Pull_Request
@@ -41,6 +41,6 @@ configuration:
       - addLabel:
           label: ':octocat: auto-merge'
       - enableAutoMerge:
-          mergeMethod: Squash
+          mergeMethod: Merge
       - approvePullRequest:
           comment: ':shipit:'
diff --git a/.github/policies/scheduled-prod-sync.yml b/.github/policies/scheduled-prod-sync.yml
@@ -6,18 +6,36 @@ where:
 configuration:
   resourceManagementConfiguration:
     scheduledSearches:
-    - description: Push to main (scheduled sync)
+    - description: Push to live branch (scheduled 11AM PT publish)
       frequencies:
       - daily:
-          time: 1:00
+          time: 18:00
+      filters: []
+      actions:
+      - createPullRequest:
+          head: main
+          base: live
+          title: Merge main into live
+          body: Automated merge of the main branch into live, syncing documentation content to the production environment.
+    - description: Push to live branch (scheduled 6PM PT publish)
+      frequencies:
       - daily:
-          time: 9:00
+          time: 2:00
+      filters: []
+      actions:
+      - createPullRequest:
+          head: main
+          base: live
+          title: Merge main into live
+          body: Automated merge of the main branch into live, syncing documentation content to the production environment.
+    - description: Push to live branch (scheduled 2AM PT publish)
+      frequencies:
       - daily:
-          time: 17:00
+          time: 10:00
       filters: []
       actions:
       - createPullRequest:
           head: main
           base: live
           title: Merge main into live
-          body: Please don't squash-merge this PR.
+          body: Automated merge of the main branch into live, syncing documentation content to the production environment.
diff --git a/.github/policies/scheduled-sync.yml → .github/policies/scheduled-stage-sync.yml b/.github/policies/scheduled-sync.yml → .github/policies/scheduled-stage-sync.yml
@@ -16,18 +16,7 @@ configuration:
           head: smoke-test
           base: main
           title: Merge smoke-test into main
-          body: Please don't squash-merge this PR.
-    - description: Push to main branch (scheduled 3:18PM PT publish - used as test)
-      frequencies:
-      - daily:
-          time: 22:18
-      filters: []
-      actions:
-      - createPullRequest:
-          head: smoke-test
-          base: main
-          title: Merge smoke-test into main
-          body: Please don't squash-merge this PR.
+          body: Automated merge of the smoke-test branch into main, syncing API documentation content to the staging environment.
     - description: Push to main branch (scheduled 5PM PT publish)
       frequencies:
       - daily:
@@ -38,7 +27,7 @@ configuration:
           head: smoke-test
           base: main
           title: Merge smoke-test into main
-          body: Please don't squash-merge this PR.
+          body: Automated merge of the smoke-test branch into main, syncing API documentation content to the staging environment.
     - description: Push to main branch (scheduled 1AM PT publish)
       frequencies:
       - daily:
@@ -49,4 +38,4 @@ configuration:
           head: smoke-test
           base: main
           title: Merge smoke-test into main
-          body: Please don't squash-merge this PR.
+          body: Automated merge of the smoke-test branch into main, syncing API documentation content to the staging environment.