upgrade sbt plugins

pjfanning · Dec 31, 2024 · 1030ae4 · 1030ae4
1 parent 701ab01
commit 1030ae4
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,24 +22,30 @@ jobs:
     name: Build and Test
     strategy:
       matrix:
-        os: [ubuntu-22.04]
+        os: [ubuntu-latest]
         scala: [2.12.20]
-        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
+
+      - name: Check that workflows are up to date
+        run: sbt '++ ${{ matrix.scala }}' githubWorkflowCheck
+
       - name: Build project
         run: sbt '++ ${{ matrix.scala }}' test scripted
 
@@ -58,24 +64,27 @@ jobs:
     if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))
     strategy:
       matrix:
-        os: [ubuntu-22.04]
+        os: [ubuntu-latest]
         scala: [2.12.20]
-        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
+
       - name: Download target directories (2.12.20)
         uses: actions/download-artifact@v4
         with:

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -15,6 +15,6 @@
  * limitations under the License.
  */
 
-addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.23.0")
-addSbtPlugin("com.github.sbt" % "sbt-ci-release"     % "1.8.0")
+addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.24.0")
+addSbtPlugin("com.github.sbt" % "sbt-ci-release"     % "1.9.2")
 addSbtPlugin("org.scalameta"  % "sbt-scalafmt"       % "2.5.2")