Merge pull request #63 from armanbilge/topic/upstream-mk-target-dirs

Upstream "Make target directories" step
typelevel · Jan 16, 2022 · 71b4fee · 71b4fee
2 parents 70a204b + d9ed9d6
commit 71b4fee
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 16 deletions.
diff --git a/ci/src/main/scala/org/typelevel/sbt/TypelevelCiPlugin.scala b/ci/src/main/scala/org/typelevel/sbt/TypelevelCiPlugin.scala
@@ -36,21 +36,7 @@ object TypelevelCiPlugin extends AutoPlugin {
     addCommandAlias("ci", mkCommand(ciCommands)) ++ Seq(
       githubWorkflowPublishTargetBranches := Seq(),
       githubWorkflowBuild := Seq(WorkflowStep.Sbt(List("ci"))),
-      githubWorkflowJavaVersions := Seq(JavaSpec.temurin("8")),
-      githubWorkflowGeneratedUploadSteps ~= { steps =>
-        // hack hack hack until upstreamed
-        // workaround for https://github.com/djspiewak/sbt-github-actions/pull/66
-        steps.flatMap {
-          case compressStep @ WorkflowStep
-                .Run(command :: _, _, Some("Compress target directories"), _, _, _) =>
-            val mkdirStep = WorkflowStep.Run(
-              commands = List(command.replace("tar cf targets.tar", "mkdir -p")),
-              name = Some("Make target directories")
-            )
-            List(mkdirStep, compressStep)
-          case step => List(step)
-        }
-      }
+      githubWorkflowJavaVersions := Seq(JavaSpec.temurin("8"))
     )
 
   val ciCommands = List(

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
@@ -568,6 +568,10 @@ ${indent(jobs.map(compileJob(_, sbt)).mkString("\n\n"), 1)}
             str
         }
 
+        val mkdir = WorkflowStep.Run(
+          List(s"mkdir -p ${sanitized.mkString(" ")} project/target"),
+          name = Some("Make target directories"))
+
         val tar = WorkflowStep.Run(
           List(s"tar cf targets.tar ${sanitized.mkString(" ")} project/target"),
           name = Some("Compress target directories"))
@@ -580,7 +584,7 @@ ${indent(jobs.map(compileJob(_, sbt)).mkString("\n\n"), 1)}
             "path" -> "targets.tar")
         )
 
-        Seq(tar, upload)
+        Seq(mkdir, tar, upload)
       } else {
         Seq()
       }