From 0c847518508ca5702fe2214815945ea9f2d03022 Mon Sep 17 00:00:00 2001 From: "slick-scala-steward[bot]" <243981+slick-scala-steward[bot]@users.noreply.github.com> Date: Fri, 27 Sep 2024 00:58:33 +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 d1b82d9..bbe4e1e 100644 --- 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") From e59233d802ee74334adb415648e456e9c1be5a57 Mon Sep 17 00:00:00 2001 From: "slick-scala-steward[bot]" <243981+slick-scala-steward[bot]@users.noreply.github.com> Date: Fri, 27 Sep 2024 00:58:44 +0000 Subject: [PATCH 2/2] Regenerate GitHub Actions workflow Executed command: sbt githubWorkflowGenerate --- .github/workflows/ci.yml | 3 +++ .mergify.yml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f824990..6ee35bd 100644 --- 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: Check that workflows are up to date run: sbt '++ ${{ matrix.scala }}' githubWorkflowCheck diff --git a/.mergify.yml b/.mergify.yml index 1ea4ebe..9236fe1 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: