restore step sequence

zio · Nov 28, 2024 · 223d0f2 · 223d0f2
1 parent 3fe9f88
commit 223d0f2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/zio-sbt-ci/src/main/scala/zio/sbt/ZioSbtCiPlugin.scala b/zio-sbt-ci/src/main/scala/zio/sbt/ZioSbtCiPlugin.scala
@@ -110,9 +110,7 @@ object ZioSbtCiPlugin extends AutoPlugin {
               SetupLibuv,
               SetupJava(javaVersion),
               CacheDependencies
-            ) ++ checkAllCodeCompiles.flatMap(_.flatten) ++ checkArtifactBuildProcess.flatMap(
-              _.flatten
-            ) ++ checkWebsiteBuildProcess.flatMap(_.flatten)
+            ) ++ checkAllCodeCompiles ++ checkArtifactBuildProcess ++ checkWebsiteBuildProcess
         }
       )
     )

diff --git a/zio-sbt-githubactions/src/main/scala/zio/sbt/githubactions/model.scala b/zio-sbt-githubactions/src/main/scala/zio/sbt/githubactions/model.scala
@@ -250,8 +250,6 @@ object Step {
     override def flatten: Seq[SingleStep] =
       steps.flatMap(_.flatten)
   }
-
-  implicit lazy val codec: JsonCodec[Step] = DeriveJsonCodec.gen[Step]
 }
 
 case class ImageRef(ref: String)
@@ -292,7 +290,7 @@ case class Job(
   needs: Option[Seq[String]] = None,
   services: Option[Seq[Service]] = None,
   `if`: Option[Condition] = None,
-  steps: Seq[Step.SingleStep] = Seq.empty
+  steps: Seq[Step] = Seq.empty
 ) {
 
   def id: String = name.toLowerCase().replace(" ", "-")
@@ -330,6 +328,8 @@ case class Job(
 }
 
 object Job {
+  implicit lazy val stepsCodec: JsonCodec[Seq[Step]] =
+    JsonCodec.seq[Step.SingleStep].transform[Seq[Step]](identity, _.flatMap(_.flatten))
   implicit lazy val codec: JsonCodec[Job] = DeriveJsonCodec.gen[Job]
 }