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

Use actions/setup-java to install GraalVM #756

Merged
merged 1 commit into from
Oct 10, 2024
Merged

Use actions/setup-java to install GraalVM #756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ jobs:
- name: Setup Java (graalvm@17)
id: setup-java-graalvm-17
if: matrix.java == 'graalvm@17'
uses: graalvm/setup-graalvm@v1
uses: actions/setup-java@v4
with:
distribution: graalvm
java-version: 17
Expand Down Expand Up @@ -318,7 +318,7 @@ jobs:
- name: Setup Java (graalvm@17)
id: setup-java-graalvm-17
if: matrix.java == 'graalvm@17'
uses: graalvm/setup-graalvm@v1
uses: actions/setup-java@v4
with:
distribution: graalvm
java-version: 17
Expand Down Expand Up @@ -464,7 +464,7 @@ jobs:
- name: Setup Java (graalvm@17)
id: setup-java-graalvm-17
if: matrix.java == 'graalvm@17'
uses: graalvm/setup-graalvm@v1
uses: actions/setup-java@v4
with:
distribution: graalvm
java-version: 17
Expand Down Expand Up @@ -606,7 +606,7 @@ jobs:
- name: Setup Java (graalvm@17)
id: setup-java-graalvm-17
if: matrix.java == 'graalvm@17'
uses: graalvm/setup-graalvm@v1
uses: actions/setup-java@v4
with:
distribution: graalvm
java-version: 17
Expand Down
4 changes: 4 additions & 0 deletions github-actions/src/main/scala/org/typelevel/sbt/gha/JavaSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ object JavaSpec {
def oracle(version: String): JavaSpec = JavaSpec(Distribution.Oracle, version)
def semeru(version: String): JavaSpec = JavaSpec(Distribution.Semeru, version)
def microsoft(version: String): JavaSpec = JavaSpec(Distribution.Microsoft, version)
def dragonwell(version: String): JavaSpec = JavaSpec(Distribution.Dragonwell, version)
def sapmachine(version: String): JavaSpec = JavaSpec(Distribution.SapMachine, version)

sealed abstract class Distribution(val rendering: String) extends Product with Serializable

Expand All @@ -48,5 +50,7 @@ object JavaSpec {
case object GraalVM extends Distribution("graalvm")
case object Semeru extends Distribution("semeru")
case object Microsoft extends Distribution("microsoft")
case object Dragonwell extends Distribution("dragonwell")
case object SapMachine extends Distribution("sapmachine")
}
}
6 changes: 2 additions & 4 deletions github-actions/src/main/scala/org/typelevel/sbt/gha/WorkflowStep.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,14 @@ object WorkflowStep {
))
else Nil

val SetupJavaAction = UseRef.Public("actions", "setup-java", "v4")
val SetupGraalVMAction = UseRef.Public("graalvm", "setup-graalvm", "v1")
val sbtCacheParams = if (enableCaching) Map("cache" -> "sbt") else Map.empty

versions flatMap {
case jv @ JavaSpec(JavaSpec.Distribution.GraalVM(graalVersion), javaVersion) =>
val setupId = s"setup-graalvm-${graalVersion}-$javaVersion".replace('.', '_')
val cond = s"matrix.java == '${jv.render}'"
WorkflowStep.Use(
SetupGraalVMAction,
UseRef.Public("graalvm", "setup-graalvm", "v1"),
name = Some(s"Setup GraalVM (${jv.render})"),
id = Some(setupId),
cond = Some(cond),
Expand All @@ -78,7 +76,7 @@ object WorkflowStep {
val cond = s"matrix.java == '${jv.render}'"

WorkflowStep.Use(
if (dist == JavaSpec.Distribution.GraalVM) SetupGraalVMAction else SetupJavaAction,
UseRef.Public("actions", "setup-java", "v4"),
name = Some(s"Setup Java (${jv.render})"),
id = Some(setupId),
cond = Some(cond),
Expand Down
Loading