Automatically merge PRs by the Scala Steward dev account

scala-steward-org · Jan 8, 2024 · d9c9f31 · d9c9f31
1 parent 600d2a3
commit d9c9f31
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -8,15 +8,19 @@
 pull_request_rules:
 - name: label scala-steward's PRs
   conditions:
-  - author=scala-steward
+  - or:
+    - author=scala-steward
+    - author=scala-steward-dev
   actions:
     label:
       add:
       - dependency-update
       remove: []
 - name: merge scala-steward's PRs
   conditions:
-  - author=scala-steward
+  - or:
+    - author=scala-steward
+    - author=scala-steward-dev
   - status-success=Build and Test (ubuntu-latest, 2.13, temurin@17)
   - status-success=Build and Test (ubuntu-latest, 2.13, temurin@11)
   actions:

diff --git a/build.sbt b/build.sbt
@@ -63,7 +63,12 @@ ThisBuild / githubWorkflowBuild :=
   )
 
 ThisBuild / mergifyPrRules := {
-  val authorCondition = MergifyCondition.Custom("author=scala-steward")
+  val authorCondition = MergifyCondition.Or(
+    List(
+      MergifyCondition.Custom("author=scala-steward"),
+      MergifyCondition.Custom("author=scala-steward-dev")
+    )
+  )
   Seq(
     MergifyPrRule(
       "label scala-steward's PRs",