Migrate from setup-scala to setup-java action (#833)

* Migrate from setup-scala to setup-java action * Update master-codecov.yml * Update pr-checks.yml
scapegoat-scala · Apr 13, 2024 · 8a398b1 · 8a398b1
1 parent 6b6f4e2
commit 8a398b1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/.github/workflows/master-codecov.yml b/.github/workflows/master-codecov.yml
@@ -8,9 +8,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: olafurpg/setup-scala@v14
+      - uses: actions/setup-java@v4
         with:
-          java-version: adopt@1.11
+          distribution: adopt
+          java-version: 11
       - uses: actions/cache@v4
         with:
           path: ~/.ivy2/cache

diff --git a/.github/workflows/master-release.yml b/.github/workflows/master-release.yml
@@ -10,9 +10,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - run: git fetch --prune --unshallow
-      - uses: olafurpg/setup-scala@v14
+      - uses: actions/setup-java@v4
         with:
-          java-version: adopt@1.8
+          distribution: adopt
+          java-version: 8
       - run: |
           sudo apt-get update && sudo apt-get -y install gnupg2
           mkdir ~/.gnupg && chmod 700 ~/.gnupg

diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml
@@ -8,17 +8,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [8, 11]
+        java: ['8', '11']
         scala:
           - 2.12.18
           - 2.12.19
           - 2.13.12
           - 2.13.13
     steps:
       - uses: actions/checkout@v4
-      - uses: olafurpg/setup-scala@v14
+      - uses: actions/setup-java@v4
         with:
-          java-version: adopt@1.${{matrix.java}}
+          distribution: adopt
+          java-version: ${{matrix.java}}
       - uses: actions/cache@v4
         with:
           path: ~/.ivy2/cache
@@ -35,9 +36,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: olafurpg/setup-scala@v14
+      - uses: actions/setup-java@v4
         with:
-          java-version: adopt@1.11
+          distribution: adopt
+          java-version: 11
       - uses: actions/cache@v4
         with:
           path: ~/.ivy2/cache