Skip to content

Commit

Permalink
Update GraalVM from 17 to 21
Browse files Browse the repository at this point in the history
GraalVM is no longer available under the free license: graalvm/setup-graalvm#notes-on-oracle-graalvm-for-jdk-17

sbt-typelevel already did the same: typelevel/sbt-typelevel#763
  • Loading branch information
mzuehlke committed Oct 21, 2024
1 parent eeb4bfa commit 505d73d
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 31 deletions.
60 changes: 30 additions & 30 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,25 +29,25 @@ jobs:
matrix:
os: [ubuntu-latest]
scala: [2.12, 2.13, 3]
java: [temurin@8, temurin@17, graalvm@17]
java: [temurin@8, temurin@17, graalvm@21]
project: [catsNative, catsJS, catsJVM]
exclude:
- scala: 2.12
java: temurin@17
- scala: 2.12
java: graalvm@17
java: graalvm@21
- scala: 3
java: temurin@17
- scala: 3
java: graalvm@17
java: graalvm@21
- project: catsNative
java: temurin@17
- project: catsNative
java: graalvm@17
java: graalvm@21
- project: catsJS
java: temurin@17
- project: catsJS
java: graalvm@17
java: graalvm@21
runs-on: ${{ matrix.os }}
timeout-minutes: 60
steps:
Expand Down Expand Up @@ -85,17 +85,17 @@ jobs:
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
run: sbt +update

- name: Setup Java (graalvm@17)
id: setup-java-graalvm-17
if: matrix.java == 'graalvm@17'
- name: Setup Java (graalvm@21)
id: setup-java-graalvm-21
if: matrix.java == 'graalvm@21'
uses: actions/setup-java@v4
with:
distribution: graalvm
java-version: 17
java-version: 21
cache: sbt

- name: sbt update
if: matrix.java == 'graalvm@17' && steps.setup-java-graalvm-17.outputs.cache-hit == 'false'
if: matrix.java == 'graalvm@21' && steps.setup-java-graalvm-21.outputs.cache-hit == 'false'
run: sbt +update

- name: Check that workflows are up to date
Expand Down Expand Up @@ -183,17 +183,17 @@ jobs:
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
run: sbt +update

- name: Setup Java (graalvm@17)
id: setup-java-graalvm-17
if: matrix.java == 'graalvm@17'
- name: Setup Java (graalvm@21)
id: setup-java-graalvm-21
if: matrix.java == 'graalvm@21'
uses: actions/setup-java@v4
with:
distribution: graalvm
java-version: 17
java-version: 21
cache: sbt

- name: sbt update
if: matrix.java == 'graalvm@17' && steps.setup-java-graalvm-17.outputs.cache-hit == 'false'
if: matrix.java == 'graalvm@21' && steps.setup-java-graalvm-21.outputs.cache-hit == 'false'
run: sbt +update

- name: Download target directories (2.12, catsNative)
Expand Down Expand Up @@ -353,17 +353,17 @@ jobs:
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
run: sbt +update

- name: Setup Java (graalvm@17)
id: setup-java-graalvm-17
if: matrix.java == 'graalvm@17'
- name: Setup Java (graalvm@21)
id: setup-java-graalvm-21
if: matrix.java == 'graalvm@21'
uses: actions/setup-java@v4
with:
distribution: graalvm
java-version: 17
java-version: 21
cache: sbt

- name: sbt update
if: matrix.java == 'graalvm@17' && steps.setup-java-graalvm-17.outputs.cache-hit == 'false'
if: matrix.java == 'graalvm@21' && steps.setup-java-graalvm-21.outputs.cache-hit == 'false'
run: sbt +update

- name: Submit Dependencies
Expand Down Expand Up @@ -439,17 +439,17 @@ jobs:
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
run: sbt +update

- name: Setup Java (graalvm@17)
id: setup-java-graalvm-17
if: matrix.java == 'graalvm@17'
- name: Setup Java (graalvm@21)
id: setup-java-graalvm-21
if: matrix.java == 'graalvm@21'
uses: actions/setup-java@v4
with:
distribution: graalvm
java-version: 17
java-version: 21
cache: sbt

- name: sbt update
if: matrix.java == 'graalvm@17' && steps.setup-java-graalvm-17.outputs.cache-hit == 'false'
if: matrix.java == 'graalvm@21' && steps.setup-java-graalvm-21.outputs.cache-hit == 'false'
run: sbt +update

- name: Generate site
Expand Down Expand Up @@ -505,17 +505,17 @@ jobs:
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
run: sbt +update

- name: Setup Java (graalvm@17)
id: setup-java-graalvm-17
if: matrix.java == 'graalvm@17'
- name: Setup Java (graalvm@21)
id: setup-java-graalvm-21
if: matrix.java == 'graalvm@21'
uses: actions/setup-java@v4
with:
distribution: graalvm
java-version: 17
java-version: 21
cache: sbt

- name: sbt update
if: matrix.java == 'graalvm@17' && steps.setup-java-graalvm-17.outputs.cache-hit == 'false'
if: matrix.java == 'graalvm@21' && steps.setup-java-graalvm-21.outputs.cache-hit == 'false'
run: sbt +update

- name: Scalafix tests
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ val munitVersion = "1.0.2"

val PrimaryJava = JavaSpec.temurin("8")
val LTSJava = JavaSpec.temurin("17")
val GraalVM = JavaSpec.graalvm("17")
val GraalVM = JavaSpec.graalvm("21")

ThisBuild / githubWorkflowJavaVersions := Seq(PrimaryJava, LTSJava, GraalVM)

Expand Down

0 comments on commit 505d73d

Please sign in to comment.