diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ef42fc0..a6be23c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: matrix: os: [ubuntu-latest, macos-latest, windows-latest] scala: [2.12.15] - java: [adopt@1.8] + java: [temurin@11] runs-on: ${{ matrix.os }} steps: - name: Ignore line ending differences in git @@ -36,10 +36,12 @@ jobs: with: fetch-depth: 0 - - name: Setup Java and Scala - uses: olafurpg/setup-scala@v13 + - name: Setup Java (temurin@11) + if: matrix.java == 'temurin@11' + uses: actions/setup-java@v2 with: - java-version: ${{ matrix.java }} + distribution: temurin + java-version: 11 - name: Cache sbt uses: actions/cache@v2 @@ -78,7 +80,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.12.15] - java: [adopt@1.8] + java: [temurin@11] runs-on: ${{ matrix.os }} steps: - name: Ignore line ending differences in git @@ -90,10 +92,12 @@ jobs: with: fetch-depth: 0 - - name: Setup Java and Scala - uses: olafurpg/setup-scala@v13 + - name: Setup Java (temurin@11) + if: matrix.java == 'temurin@11' + uses: actions/setup-java@v2 with: - java-version: ${{ matrix.java }} + distribution: temurin + java-version: 11 - name: Cache sbt uses: actions/cache@v2 diff --git a/build.sbt b/build.sbt index fa2d1c4..97aec46 100644 --- a/build.sbt +++ b/build.sbt @@ -16,7 +16,7 @@ name := "sbt-github-actions" -ThisBuild / baseVersion := "0.13" +ThisBuild / baseVersion := "0.14" ThisBuild / organization := "com.codecommit" ThisBuild / publishGithubUser := "djspiewak" diff --git a/dumps/1638295906794/graal_diagnostics_72509.zip b/dumps/1638295906794/graal_diagnostics_72509.zip new file mode 100644 index 0000000..ebacb44 Binary files /dev/null and b/dumps/1638295906794/graal_diagnostics_72509.zip differ diff --git a/src/main/scala/sbtghactions/GenerativeKeys.scala b/src/main/scala/sbtghactions/GenerativeKeys.scala index f810159..93b338c 100644 --- a/src/main/scala/sbtghactions/GenerativeKeys.scala +++ b/src/main/scala/sbtghactions/GenerativeKeys.scala @@ -48,7 +48,7 @@ trait GenerativeKeys { lazy val githubWorkflowPublishTargetBranches = settingKey[Seq[RefPredicate]]("A set of branch predicates which will be applied to determine whether the current branch gets a publication stage; if empty, publish will be skipped entirely (default: [== main])") lazy val githubWorkflowPublishCond = settingKey[Option[String]]("A set of conditionals to apply to the publish job to further restrict its run (default: [])") - lazy val githubWorkflowJavaVersions = settingKey[Seq[String]]("A list of Java versions to be used for the build job. The publish job will use the *first* of these versions. (default: [adopt@1.8])") + lazy val githubWorkflowJavaVersions = settingKey[Seq[JavaSpec]]("A list of Java versions to be used for the build job. The publish job will use the *first* of these versions. (default: [temurin@11])") lazy val githubWorkflowScalaVersions = settingKey[Seq[String]]("A list of Scala versions on which to build the project (default: crossScalaVersions.value)") lazy val githubWorkflowOSes = settingKey[Seq[String]]("A list of OS names (default: [ubuntu-latest])") diff --git a/src/main/scala/sbtghactions/GenerativePlugin.scala b/src/main/scala/sbtghactions/GenerativePlugin.scala index ab9c05b..a002926 100644 --- a/src/main/scala/sbtghactions/GenerativePlugin.scala +++ b/src/main/scala/sbtghactions/GenerativePlugin.scala @@ -57,6 +57,9 @@ object GenerativePlugin extends AutoPlugin { type Paths = sbtghactions.Paths val Paths = sbtghactions.Paths + + type JavaSpec = sbtghactions.JavaSpec + val JavaSpec = sbtghactions.JavaSpec } import autoImport._ @@ -387,7 +390,7 @@ strategy:${renderedFailFast} matrix: os:${compileList(job.oses, 3)} scala:${compileList(job.scalas, 3)} - java:${compileList(job.javas, 3)}${renderedMatrices} + java:${compileList(job.javas.map(_.render), 3)}${renderedMatrices} runs-on: ${runsOn}${renderedEnvironment}${renderedContainer}${renderedEnv} steps: ${indent(job.steps.map(compileStep(_, sbt, declareShell = declareShell)).mkString("\n\n"), 1)}""" @@ -427,7 +430,7 @@ s""" val renderedPaths = paths match { case Paths.None => "" - case Paths.Include(paths) => + case Paths.Include(paths) => "\n" + indent(s"""paths: [${paths.map(wrap).mkString(", ")}]""", 2) case Paths.Ignore(paths) => "\n" + indent(s"""paths-ignore: [${paths.map(wrap).mkString(", ")}]""", 2) @@ -476,7 +479,7 @@ ${indent(jobs.map(compileJob(_, sbt)).mkString("\n\n"), 1)} githubWorkflowPublishTargetBranches := Seq(RefPredicate.Equals(Ref.Branch("main"))), githubWorkflowPublishCond := None, - githubWorkflowJavaVersions := Seq("adopt@1.8"), + githubWorkflowJavaVersions := Seq(JavaSpec.temurin("11")), githubWorkflowScalaVersions := crossScalaVersions.value, githubWorkflowOSes := Seq("ubuntu-latest"), githubWorkflowDependencyPatterns := Seq("**/*.sbt", "project/build.properties"), @@ -610,9 +613,9 @@ ${indent(jobs.map(compileJob(_, sbt)).mkString("\n\n"), 1)} Nil } - autoCrlfOpt ::: List( - WorkflowStep.CheckoutFull, - WorkflowStep.SetupScala) ::: + autoCrlfOpt ::: + List(WorkflowStep.CheckoutFull) ::: + WorkflowStep.SetupJava(githubWorkflowJavaVersions.value.toList) ::: githubWorkflowGeneratedCacheSteps.value.toList }, diff --git a/src/main/scala/sbtghactions/JavaSpec.scala b/src/main/scala/sbtghactions/JavaSpec.scala new file mode 100644 index 0000000..b774380 --- /dev/null +++ b/src/main/scala/sbtghactions/JavaSpec.scala @@ -0,0 +1,41 @@ +/* + * Copyright 2020-2021 Daniel Spiewak + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +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 dist => s"${dist.rendering}@$version" + } +} + +object JavaSpec { + + def temurin(version: String): JavaSpec = JavaSpec(Distribution.Temurin, version) + def graalvm(graal: String, version: String): JavaSpec = JavaSpec(Distribution.GraalVM(graal), version) + + sealed abstract class Distribution(val rendering: String) extends Product with Serializable + + object Distribution { + case object Temurin extends Distribution("temurin") + case object Zulu extends Distribution("zulu") + case object Adopt extends Distribution("adopt-hotspot") + case object OpenJ9 extends Distribution("adopt-openj9") + case object Liberica extends Distribution("liberica") + final case class GraalVM(version: String) extends Distribution(version) + } +} diff --git a/src/main/scala/sbtghactions/Paths.scala b/src/main/scala/sbtghactions/Paths.scala index a40aa8c..e2cfea8 100644 --- a/src/main/scala/sbtghactions/Paths.scala +++ b/src/main/scala/sbtghactions/Paths.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021 Daniel Spiewak + * Copyright 2020-2021 Daniel Spiewak * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/scala/sbtghactions/WorkflowJob.scala b/src/main/scala/sbtghactions/WorkflowJob.scala index 9d1dc5b..c1b8c20 100644 --- a/src/main/scala/sbtghactions/WorkflowJob.scala +++ b/src/main/scala/sbtghactions/WorkflowJob.scala @@ -24,7 +24,7 @@ final case class WorkflowJob( env: Map[String, String] = Map(), oses: List[String] = List("ubuntu-latest"), scalas: List[String] = List("2.13.6"), - javas: List[String] = List("adopt@1.8"), + javas: List[JavaSpec] = List(JavaSpec.temurin("11")), needs: List[String] = List(), matrixFailFast: Option[Boolean] = None, matrixAdds: Map[String, List[String]] = Map(), diff --git a/src/main/scala/sbtghactions/WorkflowStep.scala b/src/main/scala/sbtghactions/WorkflowStep.scala index c06a49d..b6bfa60 100644 --- a/src/main/scala/sbtghactions/WorkflowStep.scala +++ b/src/main/scala/sbtghactions/WorkflowStep.scala @@ -32,7 +32,26 @@ object WorkflowStep { val Checkout: WorkflowStep = Use(UseRef.Public("actions", "checkout", "v2"), name = Some("Checkout current branch (fast)")) - val SetupScala: WorkflowStep = Use(UseRef.Public("olafurpg", "setup-scala", "v13"), name = Some("Setup Java and Scala"), params = Map("java-version" -> s"$${{ matrix.java }}")) + def SetupJava(versions: List[JavaSpec]): List[WorkflowStep] = + versions map { + case jv @ JavaSpec(JavaSpec.Distribution.GraalVM(graalVersion), version) => + WorkflowStep.Use( + UseRef.Public("DeLaGuardo", "setup-graalvm", "5.0"), + name = Some(s"Setup GraalVM (${jv.render})"), + cond = Some(s"matrix.java == '${jv.render}'"), + params = Map( + "graalvm" -> graalVersion, + "java" -> version)) + + case jv @ JavaSpec(dist, version) => + WorkflowStep.Use( + UseRef.Public("actions", "setup-java", "v2"), + name = Some(s"Setup Java (${jv.render})"), + cond = Some(s"matrix.java == '${jv.render}'"), + params = Map( + "distribution" -> dist.rendering, + "java-version" -> version)) + } val Tmate: WorkflowStep = Use(UseRef.Public("mxschmitt", "action-tmate", "v2"), name = Some("Setup tmate session")) diff --git a/src/sbt-test/sbtghactions/check-and-regenerate/build.sbt b/src/sbt-test/sbtghactions/check-and-regenerate/build.sbt index d00b3fe..207a426 100644 --- a/src/sbt-test/sbtghactions/check-and-regenerate/build.sbt +++ b/src/sbt-test/sbtghactions/check-and-regenerate/build.sbt @@ -6,7 +6,7 @@ ThisBuild / scalaVersion := crossScalaVersions.value.head ThisBuild / githubWorkflowTargetTags += "v*" -ThisBuild / githubWorkflowJavaVersions += "graalvm@21.1.0" +ThisBuild / githubWorkflowJavaVersions += JavaSpec.graalvm("21.1.0", "8") ThisBuild / githubWorkflowPublishTargetBranches += RefPredicate.Equals(Ref.Tag("test")) ThisBuild / githubWorkflowBuildMatrixAdditions += "test" -> List("this", "is") diff --git a/src/sbt-test/sbtghactions/check-and-regenerate/expected-ci.yml b/src/sbt-test/sbtghactions/check-and-regenerate/expected-ci.yml index aa1d0a2..d720af0 100644 --- a/src/sbt-test/sbtghactions/check-and-regenerate/expected-ci.yml +++ b/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: [adopt@1.8, graalvm@21.1.0] + java: [temurin@11, 'graal:21.1.0@8'] test: [this, is] include: - test: this @@ -39,10 +39,19 @@ jobs: with: fetch-depth: 0 - - name: Setup Java and Scala - uses: olafurpg/setup-scala@v13 + - name: Setup Java (temurin@11) + if: matrix.java == 'temurin@11' + uses: actions/setup-java@v2 with: - java-version: ${{ matrix.java }} + distribution: temurin + java-version: 11 + + - name: 'Setup GraalVM (graal:21.1.0@8)' + if: 'matrix.java == ''graal:21.1.0@8''' + uses: DeLaGuardo/setup-graalvm@5.0 + with: + graalvm: 21.1.0 + java: 8 - name: Cache sbt uses: actions/cache@v2 @@ -81,7 +90,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.13.6] - java: [adopt@1.8] + java: [temurin@11] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -89,10 +98,19 @@ jobs: with: fetch-depth: 0 - - name: Setup Java and Scala - uses: olafurpg/setup-scala@v13 + - name: Setup Java (temurin@11) + if: matrix.java == 'temurin@11' + uses: actions/setup-java@v2 + with: + distribution: temurin + java-version: 11 + + - name: 'Setup GraalVM (graal:21.1.0@8)' + if: 'matrix.java == ''graal:21.1.0@8''' + uses: DeLaGuardo/setup-graalvm@5.0 with: - java-version: ${{ matrix.java }} + graalvm: 21.1.0 + java: 8 - name: Cache sbt uses: actions/cache@v2 diff --git a/src/sbt-test/sbtghactions/no-clean/.github/workflows/ci.yml b/src/sbt-test/sbtghactions/no-clean/.github/workflows/ci.yml index b3989be..3917583 100644 --- a/src/sbt-test/sbtghactions/no-clean/.github/workflows/ci.yml +++ b/src/sbt-test/sbtghactions/no-clean/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.13.6, 2.12.15] - java: [adopt@1.8] + java: [temurin@11] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -31,10 +31,12 @@ jobs: with: fetch-depth: 0 - - name: Setup Java and Scala - uses: olafurpg/setup-scala@v13 + - name: Setup Java (temurin@11) + if: matrix.java == 'temurin@11' + uses: actions/setup-java@v2 with: - java-version: ${{ matrix.java }} + distribution: temurin + java-version: 11 - name: Cache sbt uses: actions/cache@v2 @@ -71,7 +73,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.13.6] - java: [adopt@1.8] + java: [temurin@11] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -79,10 +81,12 @@ jobs: with: fetch-depth: 0 - - name: Setup Java and Scala - uses: olafurpg/setup-scala@v13 + - name: Setup Java (temurin@11) + if: matrix.java == 'temurin@11' + uses: actions/setup-java@v2 with: - java-version: ${{ matrix.java }} + distribution: temurin + java-version: 11 - name: Cache sbt uses: actions/cache@v2 diff --git a/src/sbt-test/sbtghactions/non-existent-target/.github/workflows/ci.yml b/src/sbt-test/sbtghactions/non-existent-target/.github/workflows/ci.yml index 1c426ae..f3ebe4b 100644 --- a/src/sbt-test/sbtghactions/non-existent-target/.github/workflows/ci.yml +++ b/src/sbt-test/sbtghactions/non-existent-target/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.13.6] - java: [adopt@1.8] + java: [temurin@11] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -31,10 +31,12 @@ jobs: with: fetch-depth: 0 - - name: Setup Java and Scala - uses: olafurpg/setup-scala@v13 + - name: Setup Java (temurin@11) + if: matrix.java == 'temurin@11' + uses: actions/setup-java@v2 with: - java-version: ${{ matrix.java }} + distribution: temurin + java-version: 11 - name: Cache sbt uses: actions/cache@v2 @@ -70,7 +72,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.13.6] - java: [adopt@1.8] + java: [temurin@11] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -78,10 +80,12 @@ jobs: with: fetch-depth: 0 - - name: Setup Java and Scala - uses: olafurpg/setup-scala@v13 + - name: Setup Java (temurin@11) + if: matrix.java == 'temurin@11' + uses: actions/setup-java@v2 with: - java-version: ${{ matrix.java }} + distribution: temurin + java-version: 11 - name: Cache sbt uses: actions/cache@v2 diff --git a/src/sbt-test/sbtghactions/sbt-native-thin-client/.github/workflows/ci.yml b/src/sbt-test/sbtghactions/sbt-native-thin-client/.github/workflows/ci.yml index 1231383..fde4de8 100644 --- a/src/sbt-test/sbtghactions/sbt-native-thin-client/.github/workflows/ci.yml +++ b/src/sbt-test/sbtghactions/sbt-native-thin-client/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.12.14] - java: [adopt@1.8] + java: [temurin@11] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -31,10 +31,12 @@ jobs: with: fetch-depth: 0 - - name: Setup Java and Scala - uses: olafurpg/setup-scala@v13 + - name: Setup Java (temurin@11) + if: matrix.java == 'temurin@11' + uses: actions/setup-java@v2 with: - java-version: ${{ matrix.java }} + distribution: temurin + java-version: 11 - name: Cache sbt uses: actions/cache@v2 @@ -87,7 +89,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.12.14] - java: [adopt@1.8] + java: [temurin@11] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -95,10 +97,12 @@ jobs: with: fetch-depth: 0 - - name: Setup Java and Scala - uses: olafurpg/setup-scala@v13 + - name: Setup Java (temurin@11) + if: matrix.java == 'temurin@11' + uses: actions/setup-java@v2 with: - java-version: ${{ matrix.java }} + distribution: temurin + java-version: 11 - name: Cache sbt uses: actions/cache@v2 diff --git a/src/sbt-test/sbtghactions/suppressed-scala-version/expected-ci.yml b/src/sbt-test/sbtghactions/suppressed-scala-version/expected-ci.yml index c2c572b..9c88249 100644 --- a/src/sbt-test/sbtghactions/suppressed-scala-version/expected-ci.yml +++ b/src/sbt-test/sbtghactions/suppressed-scala-version/expected-ci.yml @@ -24,7 +24,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.13.6] - java: [adopt@1.8] + java: [temurin@11] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -32,10 +32,12 @@ jobs: with: fetch-depth: 0 - - name: Setup Java and Scala - uses: olafurpg/setup-scala@v13 + - name: Setup Java (temurin@11) + if: matrix.java == 'temurin@11' + uses: actions/setup-java@v2 with: - java-version: ${{ matrix.java }} + distribution: temurin + java-version: 11 - name: Cache sbt uses: actions/cache@v2 @@ -72,7 +74,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.13.6] - java: [adopt@1.8] + java: [temurin@11] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -80,10 +82,12 @@ jobs: with: fetch-depth: 0 - - name: Setup Java and Scala - uses: olafurpg/setup-scala@v13 + - name: Setup Java (temurin@11) + if: matrix.java == 'temurin@11' + uses: actions/setup-java@v2 with: - java-version: ${{ matrix.java }} + distribution: temurin + java-version: 11 - name: Cache sbt uses: actions/cache@v2 diff --git a/src/test/scala/sbtghactions/GenerativePluginSpec.scala b/src/test/scala/sbtghactions/GenerativePluginSpec.scala index 2a3f336..7f3e8c8 100644 --- a/src/test/scala/sbtghactions/GenerativePluginSpec.scala +++ b/src/test/scala/sbtghactions/GenerativePluginSpec.scala @@ -105,7 +105,7 @@ class GenerativePluginSpec extends Specification { | matrix: | os: [ubuntu-latest] | scala: [2.13.6] - | java: [adopt@1.8] + | java: [temurin@11] | runs-on: $${{ matrix.os }} | steps: | - run: echo Hello World @@ -144,7 +144,7 @@ class GenerativePluginSpec extends Specification { | matrix: | os: [ubuntu-latest] | scala: [2.13.6] - | java: [adopt@1.8] + | java: [temurin@11] | runs-on: $${{ matrix.os }} | steps: | - run: echo yikes @@ -155,7 +155,7 @@ class GenerativePluginSpec extends Specification { | matrix: | os: [ubuntu-latest] | scala: [2.13.6] - | java: [adopt@1.8] + | java: [temurin@11] | runs-on: $${{ matrix.os }} | steps: | - run: whoami @@ -198,7 +198,7 @@ class GenerativePluginSpec extends Specification { | matrix: | os: [ubuntu-latest] | scala: [2.13.6] - | java: [adopt@1.8] + | java: [temurin@11] | runs-on: $${{ matrix.os }} | container: 'not:real-thing' | steps: @@ -239,7 +239,7 @@ class GenerativePluginSpec extends Specification { | matrix: | os: [ubuntu-latest] | scala: [2.13.6] - | java: [adopt@1.8] + | java: [temurin@11] | runs-on: $${{ matrix.os }} | container: | image: 'also:not-real' @@ -451,7 +451,7 @@ class GenerativePluginSpec extends Specification { matrix: os: [ubuntu-latest] scala: [2.13.6] - java: [adopt@1.8] + java: [temurin@11] runs-on: $${{ matrix.os }} steps: - run: echo hello @@ -476,7 +476,7 @@ class GenerativePluginSpec extends Specification { matrix: os: [ubuntu-latest, windows-latest, macos-latest] scala: [2.13.6] - java: [adopt@1.8] + java: [temurin@11] runs-on: $${{ matrix.os }} steps: - shell: bash @@ -484,14 +484,15 @@ class GenerativePluginSpec extends Specification { } "compile a job with java setup, two JVMs and two Scalas" in { + val javas = List(JavaSpec.temurin("11"), JavaSpec.graalvm("20.0.0", "8")) + val results = compileJob( WorkflowJob( "abc", "How to get to...", - List( - WorkflowStep.SetupScala), + WorkflowStep.SetupJava(javas), scalas = List("2.12.15", "2.13.6"), - javas = List("adopt@1.8", "graal@20.0.0")), + javas = javas), "") results mustEqual s"""abc: @@ -500,13 +501,22 @@ class GenerativePluginSpec extends Specification { matrix: os: [ubuntu-latest] scala: [2.12.15, 2.13.6] - java: [adopt@1.8, graal@20.0.0] + java: [temurin@11, 'graal:20.0.0@8'] runs-on: $${{ matrix.os }} steps: - - name: Setup Java and Scala - uses: olafurpg/setup-scala@v13 + - name: Setup Java (temurin@11) + if: matrix.java == 'temurin@11' + uses: actions/setup-java@v2 + with: + distribution: temurin + java-version: 11 + + - name: 'Setup GraalVM (graal:20.0.0@8)' + if: 'matrix.java == ''graal:20.0.0@8''' + uses: DeLaGuardo/setup-graalvm@5.0 with: - java-version: $${{ matrix.java }}""" + graalvm: 20.0.0 + java: 8""" } "compile a job with environment variables, conditional, and needs with an sbt step" in { @@ -529,7 +539,7 @@ class GenerativePluginSpec extends Specification { matrix: os: [ubuntu-latest] scala: [2.13.6] - java: [adopt@1.8] + java: [temurin@11] runs-on: $${{ matrix.os }} env: not: now @@ -553,7 +563,7 @@ class GenerativePluginSpec extends Specification { matrix: os: [ubuntu-latest] scala: [2.13.6] - java: [adopt@1.8] + java: [temurin@11] runs-on: $${{ matrix.os }} environment: release steps: @@ -576,7 +586,7 @@ class GenerativePluginSpec extends Specification { matrix: os: [ubuntu-latest] scala: [2.13.6] - java: [adopt@1.8] + java: [temurin@11] runs-on: $${{ matrix.os }} environment: name: release @@ -604,7 +614,7 @@ class GenerativePluginSpec extends Specification { matrix: os: [ubuntu-latest] scala: [2.13.6] - java: [adopt@1.8] + java: [temurin@11] test: [1, 2] runs-on: $${{ matrix.os }} steps: @@ -628,7 +638,7 @@ class GenerativePluginSpec extends Specification { matrix: os: [ubuntu-latest] scala: [2.13.6] - java: [adopt@1.8] + java: [temurin@11] runs-on: [ "${{ matrix.os }}", runner-label, runner-group ] steps: - run: echo hello""" @@ -673,7 +683,7 @@ class GenerativePluginSpec extends Specification { matrix: os: [ubuntu-latest] scala: [2.13.6] - java: [adopt@1.8] + java: [temurin@11] include: - scala: 2.13.6 foo: bar @@ -728,7 +738,7 @@ class GenerativePluginSpec extends Specification { matrix: os: [ubuntu-latest] scala: [2.13.6] - java: [adopt@1.8] + java: [temurin@11] exclude: - scala: 2.13.6 runs-on: $${{ matrix.os }} @@ -762,32 +772,6 @@ class GenerativePluginSpec extends Specification { "") must throwA[RuntimeException] } - "compile a job with illegal characters in the JVM" in { - val results = compileJob( - WorkflowJob( - "bippy", - "Bippity Bop Around the Clock", - List( - WorkflowStep.Run(List("echo hello")), - WorkflowStep.Checkout), - javas = List("this:is>#illegal")), - "") - - results mustEqual s"""bippy: - name: Bippity Bop Around the Clock - strategy: - matrix: - os: [ubuntu-latest] - scala: [2.13.6] - java: ['this:is>#illegal'] - runs-on: $${{ matrix.os }} - steps: - - run: echo hello - - - name: Checkout current branch (fast) - uses: actions/checkout@v2""" - } - "compile a job with a long list of scala versions" in { val results = compileJob( WorkflowJob( @@ -817,7 +801,7 @@ class GenerativePluginSpec extends Specification { - the - bounds - checking - java: [adopt@1.8] + java: [temurin@11] runs-on: $${{ matrix.os }} steps: - run: echo hello