Skip to content

Commit

Permalink
Merge pull request #561 from MicrosoftDocs/localden/policy-fixes
Browse files Browse the repository at this point in the history
Update approval logic
  • Loading branch information
localden authored Nov 1, 2024
2 parents 8c3f863 + e0d42da commit 12a9dbc
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 7 deletions.
File renamed without changes.
6 changes: 1 addition & 5 deletions .github/policies/auto-label-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -41,6 +39,4 @@ configuration:
- addLabel:
label: ':octocat: auto-merge'
- enableAutoMerge:
mergeMethod: Squash
- approvePullRequest:
comment: ':shipit:'
mergeMethod: Squash
4 changes: 2 additions & 2 deletions .github/policies/scheduled-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 12a9dbc

Please sign in to comment.