From ad5579e6a01a0e4061e83fa5708b789a83666541 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Mon, 13 May 2024 11:22:43 -0700 Subject: [PATCH] Always generate macOS `brew install sbt` step --- .../scala/org/typelevel/sbt/gha/GenerativePlugin.scala | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/github-actions/src/main/scala/org/typelevel/sbt/gha/GenerativePlugin.scala b/github-actions/src/main/scala/org/typelevel/sbt/gha/GenerativePlugin.scala index a866941c..cd62d0bd 100644 --- a/github-actions/src/main/scala/org/typelevel/sbt/gha/GenerativePlugin.scala +++ b/github-actions/src/main/scala/org/typelevel/sbt/gha/GenerativePlugin.scala @@ -781,13 +781,10 @@ ${indent(jobs.map(compileJob(_, sbt)).mkString("\n\n"), 1)} }, githubWorkflowGeneratedCacheSteps := Seq(), githubWorkflowJobSetup := { - val brewInstallSbtOpt = if (githubWorkflowOSes.value.exists(_.contains("macos"))) { + val brewInstallSbt = List( WorkflowStep .Run(List("brew install sbt"), name = Some("Install sbt"), cond = macosGuard)) - } else { - Nil - } val autoCrlfOpt = if (githubWorkflowOSes.value.exists(_.contains("windows"))) { List( @@ -799,7 +796,7 @@ ${indent(jobs.map(compileJob(_, sbt)).mkString("\n\n"), 1)} Nil } - brewInstallSbtOpt ::: + brewInstallSbt ::: autoCrlfOpt ::: List(WorkflowStep.CheckoutFull) ::: WorkflowStep.SetupJava(githubWorkflowJavaVersions.value.toList) :::