Merge pull request #305 from nafg/update/sbt-mergify-github-actions-0…

….9.0 Update sbt-mergify-github-actions to 0.9.0
nafg · Sep 29, 2024 · 43cb7c8 · 43cb7c8
2 parents a87632b + b9efee1
commit 43cb7c8
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,22 +24,25 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala: [2.13.14, 3.3.3]
-        java: [temurin@8]
+        java: [zulu@8]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Setup Java (temurin@8)
-        if: matrix.java == 'temurin@8'
+      - name: Setup Java (zulu@8)
+        if: matrix.java == 'zulu@8'
         uses: actions/setup-java@v4
         with:
-          distribution: temurin
+          distribution: zulu
           java-version: 8
           cache: sbt
 
+      - name: Setup sbt
+        uses: sbt/setup-sbt@v1
+
       - uses: actions/setup-node@v4
         with:
           node-version: 18
@@ -67,22 +70,25 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala: [3.3.3]
-        java: [temurin@8]
+        java: [zulu@8]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Setup Java (temurin@8)
-        if: matrix.java == 'temurin@8'
+      - name: Setup Java (zulu@8)
+        if: matrix.java == 'zulu@8'
         uses: actions/setup-java@v4
         with:
-          distribution: temurin
+          distribution: zulu
           java-version: 8
           cache: sbt
 
+      - name: Setup sbt
+        uses: sbt/setup-sbt@v1
+
       - uses: actions/setup-node@v4
         with:
           node-version: 18

diff --git a/.mergify.yml b/.mergify.yml
@@ -1,15 +1,15 @@
 defaults: {}
 queue_rules:
   - name: default
-    conditions: []
+    merge_conditions: []
 pull_request_rules:
   - name: Automatically merge successful Scala Steward PRs
     conditions:
       - 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)
+      - check-success=Build and Test (ubuntu-latest, 2.13.14, zulu@8)
+      - check-success=Build and Test (ubuntu-latest, 3.3.3, zulu@8)
     actions:
         queue:
             name: default
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -2,4 +2,4 @@ addSbtPlugin("org.scala-js"           % "sbt-scalajs"                % "1.16.0")
 addSbtPlugin("ch.epfl.scala"          % s"sbt-scalajs-bundler"       % "0.21.1")
 addSbtPlugin("com.github.sbt"         % "sbt-dynver"                 % "5.0.1")
 addSbtPlugin("com.github.sbt"         % "sbt-ci-release"             % "1.5.12")
-addSbtPlugin("io.github.nafg.mergify" % "sbt-mergify-github-actions" % "0.8.2")
+addSbtPlugin("io.github.nafg.mergify" % "sbt-mergify-github-actions" % "0.9.0")