From f1e0b66372f270152909d528c791196e8cc73e25 Mon Sep 17 00:00:00 2001
From: "nafg-scala-steward[bot]"
 <243680+nafg-scala-steward[bot]@users.noreply.github.com>
Date: Fri, 27 Sep 2024 00:56:28 +0000
Subject: [PATCH 1/2] Update sbt-mergify-github-actions to 0.9.0

---
 project/plugins.sbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/plugins.sbt b/project/plugins.sbt
index f164c3d..e60589a 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,5 +1,5 @@
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
 addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.21.1")
 addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.6.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")
 libraryDependencies += "io.github.nafg.scalac-options" %% "scalac-options" % "0.3.0"

From 1668c8c2193e0375ea18b393c897091c3781b177 Mon Sep 17 00:00:00 2001
From: Naftoli Gugenheim <98384+nafg@users.noreply.github.com>
Date: Fri, 27 Sep 2024 16:30:17 -0400
Subject: [PATCH 2/2] Run sbt githubWorkflowGenerate

---
 .github/workflows/ci.yml | 6 ++++++
 .mergify.yml             | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e048325..f92b1c9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -40,6 +40,9 @@ jobs:
           java-version: 11
           cache: sbt
 
+      - name: Setup sbt
+        uses: sbt/setup-sbt@v1
+
       - name: Check that workflows are up to date
         run: sbt '++ ${{ matrix.scala }}' githubWorkflowCheck
 
@@ -79,6 +82,9 @@ jobs:
           java-version: 11
           cache: sbt
 
+      - name: Setup sbt
+        uses: sbt/setup-sbt@v1
+
       - name: Download target directories (2.13.14)
         uses: actions/download-artifact@v4
         with:
diff --git a/.mergify.yml b/.mergify.yml
index 3050714..6bbb833 100644
--- 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: