[ci] Replace setup-java with coursier setup

due to sbt being removed from the base github runner image
rayrobdod · Dec 19, 2024 · 983af1c · 983af1c
1 parent 317f5c8
commit 983af1c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/publish-ghpages.yml b/.github/workflows/publish-ghpages.yml
@@ -20,7 +20,7 @@ jobs:
       with:
         fetch-depth: 0
     - name: cache sbt packages
-      # but with a different name than setup-java would use,
+      # but with a different name than coursier/cache-action would use,
       # since webStage will pull some artifacts that the other tasks will not
       # and caches are immutable, meaning without a new cache key,
       # the webStage artifacts will not be cached
@@ -37,10 +37,10 @@ jobs:
           sbt-site-
           setup-java-Linux-sbt-${{ hashFiles('**/*.sbt','**/project/build.properties','**/project/**.scala','**/project/**.sbt') }}
           setup-java-Linux-sbt-
-    - uses: actions/setup-java@v4
+    - uses: coursier/setup-action@v1
       with:
-        distribution: 'zulu'
-        java-version: '17'
+        apps: sbt
+        jvm: zulu:17
     - name: Setup Pages
       uses: actions/configure-pages@v4
     - name: Build site

diff --git a/.github/workflows/publish-sonatype.yml b/.github/workflows/publish-sonatype.yml
@@ -10,11 +10,11 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: actions/setup-java@v4
+      - uses: coursier/cache-action@v6
+      - uses: coursier/setup-action@v1
         with:
-          distribution: temurin
-          java-version: 8
-          cache: sbt
+          apps: sbt
+          jvm: temurin:8
       - run: sbt ci-release
         env:
           PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -11,11 +11,11 @@ jobs:
     name: Test-${{ matrix.os }}-${{ matrix.java }}
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-java@v4
+    - uses: coursier/cache-action@v6
+    - uses: coursier/setup-action@v1
       with:
-        distribution: 'zulu'
-        java-version: ${{ matrix.java }}
-        cache: 'sbt'
+        apps: sbt
+        jvm: zulu:${{matrix.java}}
     - name: set sbt settings
       run: echo "Global / parallelExecution := false">parallelExecution.sbt
     - name: sbt test
@@ -46,11 +46,11 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - uses: actions/setup-java@v4
+    - uses: coursier/cache-action@v6
+    - uses: coursier/setup-action@v1
       with:
-        distribution: 'zulu'
-        java-version: ${{ matrix.java }}
-        cache: 'sbt'
+        apps: sbt
+        jvm: zulu:${{matrix.java}}
     - name: publishLocal
       run: sbt publishLocal
     - name: move local publish to somewhere upload-artifact can reach