Always generate macOS brew install sbt step

typelevel · May 13, 2024 · ad5579e · ad5579e
1 parent 8c20483
commit ad5579e
Showing 1 changed file with 2 additions and 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
@@ -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) :::