actions/runner
1
0
Fork 0
mirror of https://github.com/actions/runner.git synced 2025-12-10 04:06:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix continue on error (#1238)

Browse Source
This commit is contained in:
Thomas Boop
2021-08-03 17:44:58 -04:00
committed by GitHub
parent aab4aca8f7
commit 3851acd0cf
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Runner.Worker/Handlers/CompositeActionHandler.cs
View File

@@ -153,7 +153,7 @@ namespace GitHub.Runner.Worker.Handlers
}
// Run embedded steps
await RunStepsAsync(embeddedSteps);
await RunStepsAsync(embeddedSteps, stage);
// Set outputs
ExecutionContext.ExpressionValues["inputs"] = inputsData;
@@ -212,7 +212,7 @@ namespace GitHub.Runner.Worker.Handlers
}
}
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 @@ namespace GitHub.Runner.Worker.Handlers
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;
}
}
}
}