From e0d42da2eee6e6736eb0f918e4b10f5f0d60b780 Mon Sep 17 00:00:00 2001 From: Den <53200638+localden@users.noreply.github.com> Date: Fri, 1 Nov 2024 14:49:50 -0700 Subject: [PATCH] Update approval logic --- CODEOWNERS => .github/CODEOWNERS | 0 .github/policies/auto-label-pr.yml | 6 +----- .github/policies/scheduled-sync.yml | 4 ++-- 3 files changed, 3 insertions(+), 7 deletions(-) rename CODEOWNERS => .github/CODEOWNERS (100%) diff --git a/CODEOWNERS b/.github/CODEOWNERS similarity index 100% rename from CODEOWNERS rename to .github/CODEOWNERS diff --git a/.github/policies/auto-label-pr.yml b/.github/policies/auto-label-pr.yml index f2429ca7..dcb08495 100644 --- a/.github/policies/auto-label-pr.yml +++ b/.github/policies/auto-label-pr.yml @@ -24,8 +24,6 @@ configuration: label: ':octocat: auto-merge' - enableAutoMerge: mergeMethod: Squash - - approvePullRequest: - comment: ':shipit:' - description: Label publish PRs from the microsoft-github-policy-service bot triggerOnOwnActions: true if: @@ -41,6 +39,4 @@ configuration: - addLabel: label: ':octocat: auto-merge' - enableAutoMerge: - mergeMethod: Squash - - approvePullRequest: - comment: ':shipit:' \ No newline at end of file + mergeMethod: Squash \ No newline at end of file diff --git a/.github/policies/scheduled-sync.yml b/.github/policies/scheduled-sync.yml index 5f79cb03..355761f3 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 2:40PM PT publish - used as test) + - description: Push to main branch (scheduled 2:55PM PT publish - used as test) frequencies: - daily: - time: 21:40 + time: 21:55 filters: [] actions: - createPullRequest: