Merge pull request #92 from djspiewak/bug/graalvm-version-spec

Fixed graalvm version specs

.github/workflows/ci.yml

@@ -23,7 +23,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
         scala: [2.12.15]
-        java: [temurin@11]
+        java: [temurin@11, graal_20.3.1@11]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Ignore line ending differences in git
@@ -43,6 +43,13 @@ jobs:
           distribution: temurin
           java-version: 11
 
+      - name: Setup GraalVM (graal_20.3.1@11)
+        if: matrix.java == 'graal_20.3.1@11'
+        uses: DeLaGuardo/[email protected]
+        with:
+          graalvm: 20.3.1
+          java: java11
+
       - name: Cache sbt
         uses: actions/cache@v2
         with:
@@ -99,6 +106,13 @@ jobs:
           distribution: temurin
           java-version: 11
 
+      - name: Setup GraalVM (graal_20.3.1@11)
+        if: matrix.java == 'graal_20.3.1@11'
+        uses: DeLaGuardo/[email protected]
+        with:
+          graalvm: 20.3.1
+          java: java11
+
       - name: Cache sbt
         uses: actions/cache@v2
         with:

build.sbt

@@ -29,6 +29,7 @@ ThisBuild / crossScalaVersions := Seq("2.12.15")
 
 ThisBuild / githubWorkflowOSes := Seq("ubuntu-latest", "macos-latest", "windows-latest")
 ThisBuild / githubWorkflowBuild := Seq(WorkflowStep.Sbt(List("test", "scripted")))
+ThisBuild / githubWorkflowJavaVersions += JavaSpec.graalvm("20.3.1", "11")
 
 // dummy publication just to test that setup works
 ThisBuild / githubWorkflowPublishTargetBranches :=

src/main/scala/sbtghactions/JavaSpec.scala

@@ -18,7 +18,7 @@ package sbtghactions
 
 final case class JavaSpec(dist: JavaSpec.Distribution, version: String) {
   def render: String = dist match {
-    case JavaSpec.Distribution.GraalVM(gversion) => s"graal:$gversion@$version"
+    case JavaSpec.Distribution.GraalVM(gversion) => s"graal_$gversion@$version"
     case dist => s"${dist.rendering}@$version"
   }
 }

src/main/scala/sbtghactions/WorkflowStep.scala

@@ -41,7 +41,7 @@ object WorkflowStep {
           cond = Some(s"matrix.java == '${jv.render}'"),
           params = Map(
             "graalvm" -> graalVersion,
-            "java" -> version))
+            "java" -> s"java$version"))
 
       case jv @ JavaSpec(dist, version) =>
         WorkflowStep.Use(

src/sbt-test/sbtghactions/check-and-regenerate/expected-ci.yml

@@ -24,7 +24,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala: [2.13.6, 2.12.15]
-        java: [temurin@11, 'graal:21.1.0@8']
+        java: [temurin@11, graal_21.1.0@8]
         test: [this, is]
         include:
           - test: this
@@ -46,12 +46,12 @@ jobs:
           distribution: temurin
           java-version: 11
 
-      - name: 'Setup GraalVM (graal:21.1.0@8)'
-        if: 'matrix.java == ''graal:21.1.0@8'''
+      - name: Setup GraalVM (graal_21.1.0@8)
+        if: matrix.java == 'graal_21.1.0@8'
         uses: DeLaGuardo/[email protected]
         with:
           graalvm: 21.1.0
-          java: 8
+          java: java8
 
       - name: Cache sbt
         uses: actions/cache@v2
@@ -105,12 +105,12 @@ jobs:
           distribution: temurin
           java-version: 11
 
-      - name: 'Setup GraalVM (graal:21.1.0@8)'
-        if: 'matrix.java == ''graal:21.1.0@8'''
+      - name: Setup GraalVM (graal_21.1.0@8)
+        if: matrix.java == 'graal_21.1.0@8'
         uses: DeLaGuardo/[email protected]
         with:
           graalvm: 21.1.0
-          java: 8
+          java: java8
 
       - name: Cache sbt
         uses: actions/cache@v2

src/test/scala/sbtghactions/GenerativePluginSpec.scala

@@ -519,7 +519,7 @@ class GenerativePluginSpec extends Specification {
     matrix:
       os: [ubuntu-latest]
       scala: [2.12.15, 2.13.6]
-      java: [temurin@11, 'graal:20.0.0@8']
+      java: [temurin@11, graal_20.0.0@8]
   runs-on: $${{ matrix.os }}
   steps:
     - name: Setup Java (temurin@11)
@@ -529,12 +529,12 @@ class GenerativePluginSpec extends Specification {
         distribution: temurin
         java-version: 11
 
-    - name: 'Setup GraalVM (graal:20.0.0@8)'
-      if: 'matrix.java == ''graal:20.0.0@8'''
+    - name: Setup GraalVM (graal_20.0.0@8)
+      if: matrix.java == 'graal_20.0.0@8'
       uses: DeLaGuardo/[email protected]
       with:
         graalvm: 20.0.0
-        java: 8"""
+        java: java8"""
     }
 
     "compile a job with environment variables, conditional, and needs with an sbt step" in {