fix github actions runner

sbt is no longer included by default in the ubuntu 24 runner https://github.com/sbt/setup-sbt actions/setup-java#712 (comment)
joernio · Dec 23, 2024 · 23e4bb6 · 23e4bb6
1 parent adba591
commit 23e4bb6
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -15,8 +15,10 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
-          java-version: '21'
+          distribution: temurin
+          java-version: 21
+          cache: sbt
+      - uses: sbt/setup-sbt@v1
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -13,11 +13,10 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
-          java-version: '21'
-      - name: Install sbt
-        if: matrix.os == 'macos-latest'
-        run: brew install sbt
+          distribution: temurin
+          java-version: 21
+          cache: sbt
+      - uses: sbt/setup-sbt@v1
       - name: Install php
         if: matrix.os == 'macos-latest'
         run: brew install php

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,8 +15,10 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
-          java-version: '21'
+          distribution: temurin
+          java-version: 21
+          cache: sbt
+      - uses: sbt/setup-sbt@v1
       - run: sudo apt update && sudo apt install -y gnupg
       - run: echo $PGP_SECRET | base64 --decode | gpg --batch --import
         env:

diff --git a/.github/workflows/upgrade-deps.yml b/.github/workflows/upgrade-deps.yml
@@ -17,8 +17,10 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
-          java-version: '21'
+          distribution: temurin
+          java-version: 21
+          cache: sbt
+      - uses: sbt/setup-sbt@v1
       - uses: actions/cache@v4
         with:
           path: |