Add continueOnError option to WorkflowStep

Author: hugo-vrijswijk

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

@@ -264,6 +264,7 @@ ${indent(rendered.mkString("\n"), 1)}"""
     val renderedId = step.id.map(wrap).map("id: " + _ + "\n").getOrElse("")
     val renderedCond = step.cond.map(wrap).map("if: " + _ + "\n").getOrElse("")
     val renderedShell = if (declareShell) "shell: bash\n" else ""
+    val renderedContinueOnError = if (step.continueOnError) "continue-on-error: true\n" else ""
 
     val renderedEnvPre = compileEnv(step.env)
     val renderedEnv =
@@ -288,7 +289,12 @@ ${indent(rendered.mkString("\n"), 1)}"""
       case run: Run =>
         val renderedWorkingDirectory =
           run.workingDirectory.map(wrap).map("working-directory: " + _ + "\n").getOrElse("")
-        renderRunBody(run.commands, run.params, renderedShell, renderedWorkingDirectory)
+        renderRunBody(
+          run.commands,
+          run.params,
+          renderedShell,
+          renderedWorkingDirectory,
+          renderedContinueOnError)
 
       case sbtStep: Sbt =>
         import sbtStep.commands
@@ -312,7 +318,8 @@ ${indent(rendered.mkString("\n"), 1)}"""
           commands = List(s"$sbt $safeCommands"),
           params = sbtStep.params,
           renderedShell = renderedShell,
-          renderedWorkingDirectory = ""
+          renderedWorkingDirectory = "",
+          renderedContinueOnError = renderedContinueOnError
         )
 
       case use: Use =>
@@ -338,7 +345,7 @@ ${indent(rendered.mkString("\n"), 1)}"""
             s"uses: docker://$image:$tag"
         }
 
-        decl + renderParams(params)
+        decl + renderedContinueOnError + renderParams(params)
     }
 
     indent(preamble + body, 1).updated(0, '-')
@@ -348,8 +355,9 @@ ${indent(rendered.mkString("\n"), 1)}"""
       commands: List[String],
       params: Map[String, String],
       renderedShell: String,
-      renderedWorkingDirectory: String) =
-    renderedShell + renderedWorkingDirectory + "run: " + wrap(
+      renderedWorkingDirectory: String,
+      renderedContinueOnError: String) =
+    renderedShell + renderedWorkingDirectory + renderedContinueOnError + "run: " + wrap(
       commands.mkString("\n")) + renderParams(params)
 
   def renderParams(params: Map[String, String]): String = {

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

@@ -22,12 +22,14 @@ sealed abstract class WorkflowStep extends Product with Serializable {
   def cond: Option[String]
   def env: Map[String, String]
   def timeoutMinutes: Option[Int]
+  def continueOnError: Boolean
 
   def withId(id: Option[String]): WorkflowStep
   def withName(name: Option[String]): WorkflowStep
   def withCond(cond: Option[String]): WorkflowStep
   def withEnv(env: Map[String, String]): WorkflowStep
   def withTimeoutMinutes(minutes: Option[Int]): WorkflowStep
+  def withContinueOnError(continueOnError: Boolean): WorkflowStep
 
   def updatedEnv(name: String, value: String): WorkflowStep
   def concatEnv(env: TraversableOnce[(String, String)]): WorkflowStep
@@ -144,8 +146,18 @@ object WorkflowStep {
         env: Map[String, String] = Map(),
         params: Map[String, String] = Map(),
         timeoutMinutes: Option[Int] = None,
-        workingDirectory: Option[String] = None): Run =
-      Impl(commands, id, name, cond, env, params, timeoutMinutes, workingDirectory)
+        workingDirectory: Option[String] = None,
+        continueOnError: Boolean = false): Run =
+      Impl(
+        commands,
+        id,
+        name,
+        cond,
+        env,
+        params,
+        timeoutMinutes,
+        workingDirectory,
+        continueOnError)
 
     private final case class Impl(
         commands: List[String],
@@ -155,7 +167,8 @@ object WorkflowStep {
         env: Map[String, String],
         params: Map[String, String],
         timeoutMinutes: Option[Int],
-        workingDirectory: Option[String])
+        workingDirectory: Option[String],
+        continueOnError: Boolean)
         extends Run {
       override def productPrefix = "Run"
       // scalafmt: { maxColumn = 200 }
@@ -164,6 +177,7 @@ object WorkflowStep {
       def withCond(cond: Option[String]) = copy(cond = cond)
       def withEnv(env: Map[String, String]) = copy(env = env)
       def withTimeoutMinutes(minutes: Option[Int]) = copy(timeoutMinutes = minutes)
+      def withContinueOnError(continueOnError: Boolean) = copy(continueOnError = continueOnError)
 
       def withCommands(commands: List[String]) = copy(commands = commands)
       def withParams(params: Map[String, String]) = copy(params = params)
@@ -201,8 +215,9 @@ object WorkflowStep {
         env: Map[String, String] = Map(),
         params: Map[String, String] = Map(),
         timeoutMinutes: Option[Int] = None,
-        preamble: Boolean = true): Sbt =
-      Impl(commands, id, name, cond, env, params, timeoutMinutes, preamble)
+        preamble: Boolean = true,
+        continueOnError: Boolean = false): Sbt =
+      Impl(commands, id, name, cond, env, params, timeoutMinutes, preamble, continueOnError)
 
     private final case class Impl(
         commands: List[String],
@@ -212,7 +227,8 @@ object WorkflowStep {
         env: Map[String, String],
         params: Map[String, String],
         timeoutMinutes: Option[Int],
-        preamble: Boolean)
+        preamble: Boolean,
+        continueOnError: Boolean)
         extends Sbt {
       override def productPrefix = "Sbt"
       // scalafmt: { maxColumn = 200 }
@@ -221,6 +237,7 @@ object WorkflowStep {
       def withCond(cond: Option[String]) = copy(cond = cond)
       def withEnv(env: Map[String, String]) = copy(env = env)
       def withTimeoutMinutes(minutes: Option[Int]) = copy(timeoutMinutes = minutes)
+      def withContinueOnError(continueOnError: Boolean): WorkflowStep = copy(continueOnError = continueOnError)
 
       def withCommands(commands: List[String]) = copy(commands = commands)
       def withParams(params: Map[String, String]) = copy(params = params)
@@ -256,8 +273,9 @@ object WorkflowStep {
         name: Option[String] = None,
         cond: Option[String] = None,
         env: Map[String, String] = Map(),
-        timeoutMinutes: Option[Int] = None): Use =
-      Impl(ref, params, id, name, cond, env, timeoutMinutes)
+        timeoutMinutes: Option[Int] = None,
+        continueOnError: Boolean = false): Use =
+      Impl(ref, params, id, name, cond, env, timeoutMinutes, continueOnError)
 
     private final case class Impl(
         ref: UseRef,
@@ -266,7 +284,8 @@ object WorkflowStep {
         name: Option[String],
         cond: Option[String],
         env: Map[String, String],
-        timeoutMinutes: Option[Int])
+        timeoutMinutes: Option[Int],
+        continueOnError: Boolean)
         extends Use {
       override def productPrefix = "Use"
       // scalafmt: { maxColumn = 200 }
@@ -275,6 +294,7 @@ object WorkflowStep {
       def withCond(cond: Option[String]) = copy(cond = cond)
       def withEnv(env: Map[String, String]) = copy(env = env)
       def withTimeoutMinutes(minutes: Option[Int]) = copy(timeoutMinutes = minutes)
+      def withContinueOnError(continueOnError: Boolean) = copy(continueOnError = continueOnError)
 
       def withRef(ref: UseRef) = copy(ref = ref)
       def withParams(params: Map[String, String]) = copy(params = params)