Merge branch 'master' into update/sbt-ci-release-1.6.1

nafg · Aug 19, 2024 · c69f977 · c69f977
2 parents 9a70794 + 4049260
commit c69f977
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/.mergify.yml b/.mergify.yml
@@ -5,7 +5,9 @@ queue_rules:
 pull_request_rules:
   - name: Automatically merge successful Scala Steward PRs
     conditions:
-      - author=scala-steward
+      - or:
+          - author=scala-steward
+          - author=nafg-scala-steward[bot]
       - check-success=Build and Test (ubuntu-latest, 2.13.14, temurin@8)
       - check-success=Build and Test (ubuntu-latest, 3.3.3, temurin@8)
     actions:

diff --git a/ci.sbt b/ci.sbt
@@ -1,4 +1,13 @@
+import _root_.io.github.nafg.mergify.dsl.*
+
+
 val repoPath = "nafg/jewish-date"
+
+mergifyExtraConditions := Seq(
+  (Attr.Author :== "scala-steward") ||
+    (Attr.Author :== "nafg-scala-steward[bot]")
+)
+
 inThisBuild(List(
   homepage := Some(url(s"https://github.com/$repoPath")),
   licenses := List("Apache-2.0" -> url("https://www.apache.org/licenses/LICENSE-2.0")),