Skip to content

Commit d91ea14

Browse files
authored
Update auto-merge.yml
1 parent 39bc191 commit d91ea14

File tree

1 file changed

+34
-22
lines changed

1 file changed

+34
-22
lines changed

.github/policies/auto-merge.yml

Lines changed: 34 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,50 @@
1+
id:
12
name: GitOps.PullRequestIssueManagement
23
description: GitOps.PullRequestIssueManagement primitive
4+
owner:
35
resource: repository
4-
6+
disabled: false
7+
where:
58
configuration:
69
resourceManagementConfiguration:
710
eventResponderTasks:
8-
- description: Auto-squash-merge PRs to main labeled with auto-merge
11+
- description: Approve and auto-squash-merge dependabot PRs to main labeled 'auto-merge'
912
triggerOnOwnActions: true
1013
if:
11-
- payloadType: Pull_Request
12-
- labelAdded:
13-
label: ':octocat: auto-merge'
14-
- targetsBranch:
15-
branch: main
14+
- payloadType: Pull_Request
15+
- labelAdded:
16+
label: ':octocat: auto-merge'
17+
- targetsBranch:
18+
branch: main
19+
- or:
20+
- isActivitySender:
21+
user: dependabot
22+
- isActivitySender:
23+
user: dependabot[bot]
1624
then:
17-
- enableAutoMerge:
18-
mergeMethod: Squash
25+
- enableAutoMerge:
26+
mergeMethod: Squash
27+
- approvePullRequest:
28+
comment: "Approved; this PR will merge when all status checks pass."
1929

20-
- description: Auto-merge PRs to live labeled with auto-merge
30+
- description: Auto-merge policy service bot PRs to live labeled 'auto-merge'
2131
triggerOnOwnActions: true
2232
if:
23-
- payloadType: Pull_Request
24-
- labelAdded:
25-
label: ':octocat: auto-merge'
26-
- targetsBranch:
27-
branch: live
33+
- payloadType: Pull_Request
34+
- labelAdded:
35+
label: ':octocat: auto-merge'
36+
- targetsBranch:
37+
branch: live
38+
- isActivitySender:
39+
user: dotnet-policy-service[bot]
2840
then:
29-
- enableAutoMerge:
30-
mergeMethod: Merge
41+
- enableAutoMerge:
42+
mergeMethod: Merge
3143

32-
- description: Don't auto-merge PRs with auto-merge label removed
44+
- description: Don't auto-merge PRs with 'auto-merge' label removed
3345
if:
34-
- payloadType: Pull_Request
35-
- labelRemoved:
36-
label: ':octocat: auto-merge'
46+
- payloadType: Pull_Request
47+
- labelRemoved:
48+
label: ':octocat: auto-merge'
3749
then:
38-
- disableAutoMerge
50+
- disableAutoMerge

0 commit comments

Comments
 (0)