Merge pull request #100 from slick/update/sbt-mergify-github-actions-…

…0.9.0 Update sbt-mergify-github-actions to 0.9.0
slick · Sep 27, 2024 · 0b0e416 · 0b0e416
2 parents e88af2d + 82940fa
commit 0b0e416
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -39,6 +39,9 @@ jobs:
           java-version: 11
           cache: sbt
 
+      - name: Setup sbt
+        uses: sbt/setup-sbt@v1
+
       - name: Start database
         run: docker compose up -d
 
@@ -81,6 +84,9 @@ jobs:
           java-version: 11
           cache: sbt
 
+      - name: Setup sbt
+        uses: sbt/setup-sbt@v1
+
       - name: Download target directories (2.12.19)
         uses: actions/download-artifact@v4
         with:

diff --git a/.mergify.yml b/.mergify.yml
@@ -1,7 +1,7 @@
 defaults: {}
 queue_rules:
   - name: default
-    conditions: []
+    merge_conditions: []
 pull_request_rules:
   - name: Automatically merge successful Scala Steward PRs
     conditions:

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("io.github.nafg.mergify" % "sbt-mergify-github-actions" % "0.8.2")
+addSbtPlugin("io.github.nafg.mergify" % "sbt-mergify-github-actions" % "0.9.0")