Skip to content

Commit 767ab7d

Browse files
authored
Merge pull request #3264 from scala-steward-org/topic/merge-steward-dev-prs
Automatically merge PRs by the Scala Steward dev account
2 parents 600d2a3 + d9c9f31 commit 767ab7d

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

.mergify.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,19 @@
88
pull_request_rules:
99
- name: label scala-steward's PRs
1010
conditions:
11-
- author=scala-steward
11+
- or:
12+
- author=scala-steward
13+
- author=scala-steward-dev
1214
actions:
1315
label:
1416
add:
1517
- dependency-update
1618
remove: []
1719
- name: merge scala-steward's PRs
1820
conditions:
19-
- author=scala-steward
21+
- or:
22+
- author=scala-steward
23+
- author=scala-steward-dev
2024
- status-success=Build and Test (ubuntu-latest, 2.13, temurin@17)
2125
- status-success=Build and Test (ubuntu-latest, 2.13, temurin@11)
2226
actions:

build.sbt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,12 @@ ThisBuild / githubWorkflowBuild :=
6363
)
6464

6565
ThisBuild / mergifyPrRules := {
66-
val authorCondition = MergifyCondition.Custom("author=scala-steward")
66+
val authorCondition = MergifyCondition.Or(
67+
List(
68+
MergifyCondition.Custom("author=scala-steward"),
69+
MergifyCondition.Custom("author=scala-steward-dev")
70+
)
71+
)
6772
Seq(
6873
MergifyPrRule(
6974
"label scala-steward's PRs",

0 commit comments

Comments
 (0)