Skip to content

Commit 0089853

Browse files
committed
Add githubWorkflowPublishJavaVersion
1 parent 90bf3d6 commit 0089853

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

build.sbt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,10 @@ ThisBuild / githubWorkflowBuildPostamble += WorkflowStep.Run(
3737
name = Some("Clean up Ivy Local repo")
3838
)
3939

40-
def publishTaskJavaSpec = JavaSpec.corretto("17")
40+
ThisBuild / githubWorkflowPublishJavaVersion := JavaSpec.corretto("17")
4141

4242
ThisBuild / githubWorkflowJavaVersions := Seq(
43-
// https://github.com/sbt/sbt-github-actions/issues/216
44-
// https://github.com/sbt/sbt-github-actions/blob/6b89abdd5381ef61870b/src/main/scala/sbtghactions/GenerativePlugin.scala#L738
45-
publishTaskJavaSpec,
43+
JavaSpec.corretto("17"),
4644
JavaSpec.zulu("8"),
4745
)
4846

src/main/scala/sbtghactions/GenerativeKeys.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ trait GenerativeKeys {
5757
lazy val githubWorkflowPublishCond = settingKey[Option[String]]("A set of conditionals to apply to the publish job to further restrict its run (default: [])")
5858
lazy val githubWorkflowPublishTimeout = settingKey[Option[FiniteDuration]]("The maximum duration to let the publish job run before GitHub automatically cancels it. (default: None)")
5959

60-
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: [zulu@8])")
60+
lazy val githubWorkflowJavaVersions = settingKey[Seq[JavaSpec]]("A list of Java versions to be used for the build job. (default: [zulu@8])")
61+
lazy val githubWorkflowPublishJavaVersion = settingKey[JavaSpec]("A Java versions to be used for the publish job. (default: [zulu@8])")
6162
lazy val githubWorkflowScalaVersions = settingKey[Seq[String]]("A list of Scala versions on which to build the project (default: crossScalaVersions.value)")
6263
lazy val githubWorkflowOSes = settingKey[Seq[String]]("A list of OS names (default: [ubuntu-latest])")
6364

src/main/scala/sbtghactions/GenerativePlugin.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -620,6 +620,7 @@ ${indent(jobs.map(compileJob(_, sbt)).mkString("\n\n"), 1)}
620620
githubWorkflowPublishTimeout := None,
621621

622622
githubWorkflowJavaVersions := Seq(JavaSpec.zulu("8")),
623+
githubWorkflowPublishJavaVersion := githubWorkflowJavaVersions.value.head,
623624
githubWorkflowScalaVersions := crossScalaVersions.value,
624625
githubWorkflowOSes := Seq("ubuntu-latest"),
625626
githubWorkflowDependencyPatterns := Seq("**/*.sbt", "project/build.properties"),
@@ -776,7 +777,7 @@ ${indent(jobs.map(compileJob(_, sbt)).mkString("\n\n"), 1)}
776777
oses = List(githubWorkflowOSes.value.headOption.getOrElse("ubuntu-latest")),
777778
cond = Some(s"github.event_name != 'pull_request' && $publicationCond"),
778779
scalas = List(scalaVersion.value),
779-
javas = List(githubWorkflowJavaVersions.value.head),
780+
javas = List(githubWorkflowPublishJavaVersion.value),
780781
needs = List("build"),
781782
timeout = githubWorkflowPublishTimeout.value)).filter(_ => !githubWorkflowPublishTargetBranches.value.isEmpty)
782783

0 commit comments

Comments
 (0)