YML: use setup-java instead of setup-scala

Inspired by scalameta/sbt-scalafmt#242.
kitbellew · Dec 10, 2022 · 0c23a08 · 0c23a08
1 parent 1d711d4
commit 0c23a08
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,17 +17,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [[email protected], [email protected]]
+        java: [ '8', '11' ]
         os: [windows-latest, ubuntu-latest]
         exclude:
           - os: windows-latest
-            java: [email protected]
+            java: '8'
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
-      - uses: olafurpg/setup-scala@v13
+      - name: Set up JVM
+        uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.java }}
+          distribution: 'temurin'
+          cache: 'sbt'
       # https://github.com/dwijnand/sbt-dynver#setup
       - run: git fetch --tags --unshallow -f
       - run:
@@ -41,7 +44,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: olafurpg/setup-scala@v13
+      - uses: actions/setup-java@v3
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+          cache: 'sbt'
       - run: ./scalafmt --test
       - run: yarn install
       - run: yarn format-check
@@ -76,9 +83,13 @@ jobs:
     env: ${{ matrix.env }}
     steps:
       - uses: actions/checkout@v3
-      - uses: olafurpg/setup-scala@v13
+      - name: Set up GraalVM
+        uses: graalvm/setup-graalvm@v1
         with:
-          java-version: [email protected]
+          version: 'latest'
+          java-version: ${{ matrix.java }}
+          components: 'native-image'
+          github-token: ${{ secrets.GITHUB_TOKEN }}
       - if: matrix.libc == 'musl'
         name: Install musl bundle
         run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -8,10 +8,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: olafurpg/setup-scala@v13
-      - uses: olafurpg/setup-gpg@v3
-      # https://github.com/dwijnand/sbt-dynver#setup
-      - run: git fetch --tags --unshallow -f
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-java@v3
+        with:
+          java-version: '8'
+          distribution: 'temurin'
+          cache: 'sbt'
       - name: Publish ${{ github.ref }}
         run: sbt ci-release docs/docusaurusPublishGhpages
         env: