fix continue on error (actions#1238)

Surfndez · Aug 3, 2021 · 3851acd · 3851acd
1 parent aab4aca
commit 3851acd
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/Runner.Worker/Handlers/CompositeActionHandler.cs b/src/Runner.Worker/Handlers/CompositeActionHandler.cs
@@ -153,7 +153,7 @@ public async Task RunAsync(ActionRunStage stage)
                 }
 
                 // Run embedded steps
-                await RunStepsAsync(embeddedSteps);
+                await RunStepsAsync(embeddedSteps, stage);
 
                 // Set outputs
                 ExecutionContext.ExpressionValues["inputs"] = inputsData;
@@ -212,7 +212,7 @@ private void ProcessOutputs()
             }
         }
 
-        private async Task RunStepsAsync(List<IStep> embeddedSteps)
+        private async Task RunStepsAsync(List<IStep> embeddedSteps, ActionRunStage stage)
         {
             ArgUtil.NotNull(embeddedSteps, nameof(embeddedSteps));
 
@@ -388,9 +388,13 @@ private async Task RunStepsAsync(List<IStep> embeddedSteps)
                 if (step.ExecutionContext.Result == TaskResult.Failed || step.ExecutionContext.Result == TaskResult.Canceled)
                 {
                     Trace.Info($"Update job result with current composite step result '{step.ExecutionContext.Result}'.");
-                    ExecutionContext.Result = step.ExecutionContext.Result;
-                    ExecutionContext.Root.Result = TaskResultUtil.MergeTaskResults(ExecutionContext.Root.Result, step.ExecutionContext.Result.Value);
-                    ExecutionContext.Root.JobContext.Status = ExecutionContext.Root.Result?.ToActionResult();
+                    ExecutionContext.Result = TaskResultUtil.MergeTaskResults(ExecutionContext.Result, step.ExecutionContext.Result.Value);
+
+                    // We should run cleanup even if one of the cleanup step fails
+                    if (stage != ActionRunStage.Post)
+                    {
+                        break;
+                    }
                 }
             }
         }