diff --git a/.mergify.yml b/.mergify.yml index 63328bc525..b58f83cc8a 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -8,7 +8,9 @@ pull_request_rules: - name: label scala-steward's PRs conditions: - - author=scala-steward + - or: + - author=scala-steward + - author=scala-steward-dev actions: label: add: @@ -16,7 +18,9 @@ pull_request_rules: 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 index 4ffda8ebdc..a0d6dd6ed1 100644 --- 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",