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: 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"