Skip to content

Commit 4d9511a

Browse files
authored
Use GPS to auto-merge dependabot PRs (dotnet#41879)
1 parent a30f593 commit 4d9511a

File tree

3 files changed

+15
-35
lines changed

3 files changed

+15
-35
lines changed

.github/policies/auto-merge.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ where:
88
configuration:
99
resourceManagementConfiguration:
1010
eventResponderTasks:
11-
- description: Auto-squash-merge PRs to main labeled with auto-merge
11+
- description: Approve and auto-squash-merge PRs to main labeled with 'auto-merge'
1212
triggerOnOwnActions: true
1313
if:
1414
- payloadType: Pull_Request
@@ -22,7 +22,7 @@ configuration:
2222
- approvePullRequest:
2323
comment: "Approved; this PR will merge when all status checks pass."
2424

25-
- description: Auto-merge PRs to live labeled with auto-merge
25+
- description: Auto-merge PRs to live labeled with 'auto-merge'
2626
triggerOnOwnActions: true
2727
if:
2828
- payloadType: Pull_Request
@@ -34,7 +34,7 @@ configuration:
3434
- enableAutoMerge:
3535
mergeMethod: Merge
3636

37-
- description: Don't auto-merge PRs with auto-merge label removed
37+
- description: Don't auto-merge PRs with 'auto-merge' label removed
3838
if:
3939
- payloadType: Pull_Request
4040
- labelRemoved:

.github/policies/label-prs.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,18 @@ configuration:
6060
- addLabel:
6161
label: ":octocat: auto-merge"
6262

63+
- description: Label PRs from dependabot/dependabot[bot]
64+
if:
65+
- payloadType: Pull_Request
66+
- or:
67+
- isActivitySender:
68+
user: dependabot
69+
- isActivitySender:
70+
user: dependabot[bot]
71+
then:
72+
- addLabel:
73+
label: ":octocat: auto-merge"
74+
6375
- description: Label PRs with okr-quality
6476
if:
6577
- payloadType: Pull_Request

.github/workflows/dependabot-approve-and-automerge.yml

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)