Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update GraalVM from 17 to 21 #4152

Merged
merged 2 commits into from
Oct 21, 2024
Merged

update GraalVM from 17 to 21 #4152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0eb2a7
update GraalVM from 17 to 21
mzuehlke Oct 20, 2024
cf66797
remove install native image step
mzuehlke Oct 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 23 additions & 28 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- temurin@11
- temurin@17
- temurin@21
- graalvm@17
- graalvm@21
ci: [ciJVM, ciNative, ciJS, ciFirefox, ciChrome]
exclude:
- scala: 3.3.4
Expand All @@ -48,7 +48,7 @@ jobs:
- scala: 2.12.20
java: temurin@21
- scala: 2.12.20
java: graalvm@17
java: graalvm@21
- os: windows-latest
scala: 3.3.4
ci: ciJVM
Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:
- ci: ciJS
java: temurin@21
- ci: ciJS
java: graalvm@17
java: graalvm@21
- os: windows-latest
ci: ciJS
- os: macos-14
Expand All @@ -90,7 +90,7 @@ jobs:
- ci: ciFirefox
java: temurin@21
- ci: ciFirefox
java: graalvm@17
java: graalvm@21
- os: windows-latest
ci: ciFirefox
- os: macos-14
Expand All @@ -102,7 +102,7 @@ jobs:
- ci: ciChrome
java: temurin@21
- ci: ciChrome
java: graalvm@17
java: graalvm@21
- os: windows-latest
ci: ciChrome
- os: macos-14
Expand All @@ -114,14 +114,14 @@ jobs:
- ci: ciNative
java: temurin@21
- ci: ciNative
java: graalvm@17
java: graalvm@21
- os: windows-latest
ci: ciNative
- os: macos-14
ci: ciNative
scala: 2.12.20
- os: windows-latest
java: graalvm@17
java: graalvm@21
runs-on: ${{ matrix.os }}
timeout-minutes: 60
steps:
Expand Down Expand Up @@ -194,17 +194,17 @@ jobs:
shell: bash
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'
shell: bash
run: sbt +update

Expand All @@ -219,11 +219,6 @@ jobs:
shell: bash
run: npm install

- name: Install GraalVM Native Image
if: matrix.java == 'graalvm@17'
shell: bash
run: gu install native-image

- name: Configure Windows Pagefile
if: matrix.os == 'windows-latest'
uses: al-cheb/configure-pagefile-action@d298bdee6b133626425040e3788f1055a8b4cf7a
Expand Down Expand Up @@ -269,7 +264,7 @@ jobs:
run: example/test-js.sh ${{ matrix.scala }}

- name: Test GraalVM Native Image
if: matrix.scala == '2.13.15' && matrix.java == 'graalvm@17' && matrix.os == 'ubuntu-latest'
if: matrix.scala == '2.13.15' && matrix.java == 'graalvm@21' && matrix.os == 'ubuntu-latest'
shell: bash
run: sbt '++ ${{ matrix.scala }}' graalVMExample/nativeImage graalVMExample/nativeImageRun

Expand Down Expand Up @@ -376,17 +371,17 @@ jobs:
if: matrix.java == 'temurin@21' && steps.setup-java-temurin-21.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 (3.3.4, ciJVM)
Expand Down Expand Up @@ -604,17 +599,17 @@ jobs:
if: matrix.java == 'temurin@21' && steps.setup-java-temurin-21.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
7 changes: 1 addition & 6 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ val LatestJava = JavaSpec.temurin("17")
val LoomJava = JavaSpec.temurin("21")
val ScalaJSJava = OldGuardJava
val ScalaNativeJava = OldGuardJava
val GraalVM = JavaSpec.graalvm("17")
val GraalVM = JavaSpec.graalvm("21")

ThisBuild / githubWorkflowJavaVersions := Seq(
OldGuardJava,
Expand All @@ -161,11 +161,6 @@ ThisBuild / githubWorkflowBuildPreamble ++= Seq(
name = Some("Install jsdom and source-map-support"),
cond = Some("matrix.ci == 'ciJS'")
),
WorkflowStep.Run(
List("gu install native-image"),
name = Some("Install GraalVM Native Image"),
cond = Some(s"matrix.java == '${GraalVM.render}'")
),
WorkflowStep.Use(
UseRef.Public(
"al-cheb",
Expand Down
Loading