Cleanup render of types and steps

Author: zarthross

github-actions/src/main/scala/org/typelevel/sbt/gha/GenerativePlugin.scala

@@ -115,11 +115,9 @@ object GenerativePlugin extends AutoPlugin {
     def renderBranches(branches: List[String]) =
       if (branches.size == 0) ""
       else s"branches: [${branches.map(wrap).mkString(", ")}]"
-    def renderTypesPre(prEventTypes: List[PREventType]) =
-      prEventTypes.map(compilePREventType).mkString("[", ", ", "]")
     def renderTypes(prEventTypes: List[PREventType]) =
       if (prEventTypes.sortBy(_.toString) == PREventType.Defaults) ""
-      else "\n" + indent("types: " + renderTypesPre(prEventTypes), 2)
+      else "\ntypes: " + prEventTypes.map(compilePREventType).mkString("[", ", ", "]")
 
     def renderTags(tags: List[String]) = {
       if (tags.isEmpty) ""
@@ -619,14 +617,20 @@ object GenerativePlugin extends AutoPlugin {
 
     val renderedFailFast = job.matrixFailFast.fold("")("\n  fail-fast: " + _)
 
+    val renderedSteps = indent(
+      job
+        .steps
+        .map(compileStep(_, sbt, job.sbtStepPreamble, declareShell = declareShell))
+        .mkString("\n\n"),
+      1)
     // format: off
     val body = s"""name: ${wrap(job.name)}${renderedNeeds}${renderedCond}
       |strategy:${renderedFailFast}
       |  matrix:
       |${buildMatrix(2, "os" -> job.oses, "scala" -> job.scalas, "java" -> job.javas.map(_.render))}${renderedMatrices}
       |runs-on: ${runsOn}${renderedEnvironment}${renderedContainer}${renderedPerm}${renderedEnv}${renderedOutputs}${renderedConcurrency}${renderedTimeoutMinutes}
       |steps:
-      |${indent(job.steps.map(compileStep(_, sbt, job.sbtStepPreamble, declareShell = declareShell)).mkString("\n\n"), 1)}""".stripMargin
+      |${renderedSteps}""".stripMargin
     // format: on
 
     s"${job.id}:\n${indent(body, 1)}"
@@ -695,21 +699,21 @@ object GenerativePlugin extends AutoPlugin {
 
     val renderedOn = compileOn(on)
 
-    s"""# This file was automatically generated by sbt-github-actions using the
-# githubWorkflowGenerate task. You should add and commit this file to
-# your git repository. It goes without saying that you shouldn't edit
-# this file by hand! Instead, if you wish to make changes, you should
-# change your sbt build configuration to revise the workflow description
-# to meet your needs, then regenerate this file.
-
-${renderedName}
-
-${renderedOn}
-
-${renderedPerm}${renderedEnv}${renderedConcurrency}jobs:
-${indent(jobs.map(compileJob(_, sbt)).mkString("\n\n"), 1)}
-"""
+    val renderedJobs = "jobs:\n" + indent(jobs.map(compileJob(_, sbt)).mkString("\n\n"), 1)
 
+    s"""# This file was automatically generated by sbt-github-actions using the
+       |# githubWorkflowGenerate task. You should add and commit this file to
+       |# your git repository. It goes without saying that you shouldn't edit
+       |# this file by hand! Instead, if you wish to make changes, you should
+       |# change your sbt build configuration to revise the workflow description
+       |# to meet your needs, then regenerate this file.
+       |
+       |${renderedName}
+       |
+       |${renderedOn}
+       |
+       |${renderedPerm}${renderedEnv}${renderedConcurrency}${renderedJobs}
+       |""".stripMargin
   }
 
   val settingDefaults = Seq(