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

Set outcome/conclusion for composite action steps in steps context (#1600)

Browse Source 
* set outcome/conclusion for composite action steps in steps context

* fix typo

* pr fixes

* fix happy case!
This commit is contained in:
Thomas Boop
2022-01-12 11:14:46 -05:00
committed by GitHub
parent 7cb198a554
commit 47dfebdf48
1 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -378,14 +378,14 @@ namespace GitHub.Runner.Worker.Handlers
{ {
// Condition is false // Condition is false
Trace.Info("Skipping step due to condition evaluation."); Trace.Info("Skipping step due to condition evaluation.");
step.ExecutionContext.Result = TaskResult.Skipped; SetStepConclusion(step, TaskResult.Skipped);
continue; continue;
} }
else if (conditionEvaluateError != null) else if (conditionEvaluateError != null)
{ {
// Condition error // Condition error
step.ExecutionContext.Error(conditionEvaluateError); step.ExecutionContext.Error(conditionEvaluateError);
step.ExecutionContext.Result = TaskResult.Failed; SetStepConclusion(step, TaskResult.Failed);
ExecutionContext.Result = TaskResult.Failed; ExecutionContext.Result = TaskResult.Failed;
break; break;
} }
@@ -403,13 +403,15 @@ namespace GitHub.Runner.Worker.Handlers
jobCancelRegister = null; jobCancelRegister = null;
} }
} }
// Check failed or canceled // Check failed or canceled
if (step.ExecutionContext.Result == TaskResult.Failed || step.ExecutionContext.Result == TaskResult.Canceled) if (step.ExecutionContext.Result == TaskResult.Failed || step.ExecutionContext.Result == TaskResult.Canceled)
{ {
Trace.Info($"Update job result with current composite step result '{step.ExecutionContext.Result}'."); Trace.Info($"Update job result with current composite step result '{step.ExecutionContext.Result}'.");
ExecutionContext.Result = TaskResultUtil.MergeTaskResults(ExecutionContext.Result, step.ExecutionContext.Result.Value); ExecutionContext.Result = TaskResultUtil.MergeTaskResults(ExecutionContext.Result, step.ExecutionContext.Result.Value);
} }
// Update context
SetStepsContext(step);
} }
} }
@@ -431,13 +433,13 @@ namespace GitHub.Runner.Worker.Handlers
{ {
Trace.Error($"Caught timeout exception from step: {ex.Message}"); Trace.Error($"Caught timeout exception from step: {ex.Message}");
step.ExecutionContext.Error("The action has timed out."); step.ExecutionContext.Error("The action has timed out.");
step.ExecutionContext.Result = TaskResult.Failed; SetStepConclusion(step, TaskResult.Failed);
} }
else else
{ {
Trace.Error($"Caught cancellation exception from step: {ex}"); Trace.Error($"Caught cancellation exception from step: {ex}");
step.ExecutionContext.Error(ex); step.ExecutionContext.Error(ex);
step.ExecutionContext.Result = TaskResult.Canceled; SetStepConclusion(step, TaskResult.Canceled);
} }
} }
catch (Exception ex) catch (Exception ex)
@@ -445,17 +447,32 @@ namespace GitHub.Runner.Worker.Handlers
// Log the error and fail the step // Log the error and fail the step
Trace.Error($"Caught exception from step: {ex}"); Trace.Error($"Caught exception from step: {ex}");
step.ExecutionContext.Error(ex); step.ExecutionContext.Error(ex);
step.ExecutionContext.Result = TaskResult.Failed; SetStepConclusion(step, TaskResult.Failed);
} }
// Merge execution context result with command result // Merge execution context result with command result
if (step.ExecutionContext.CommandResult != null) if (step.ExecutionContext.CommandResult != null)
{ {
step.ExecutionContext.Result = Common.Util.TaskResultUtil.MergeTaskResults(step.ExecutionContext.Result, step.ExecutionContext.CommandResult.Value); SetStepConclusion(step, Common.Util.TaskResultUtil.MergeTaskResults(step.ExecutionContext.Result, step.ExecutionContext.CommandResult.Value));
} }
Trace.Info($"Step result: {step.ExecutionContext.Result}"); Trace.Info($"Step result: {step.ExecutionContext.Result}");
step.ExecutionContext.Debug($"Finished: {step.DisplayName}"); step.ExecutionContext.Debug($"Finished: {step.DisplayName}");
} }
private void SetStepConclusion(IStep step, TaskResult result)
{
step.ExecutionContext.Result = result;
SetStepsContext(step);
}
private void SetStepsContext(IStep step)
{
if (!string.IsNullOrEmpty(step.ExecutionContext.ContextName) && !step.ExecutionContext.ContextName.StartsWith("__", StringComparison.Ordinal))
{
// TODO: when we support continue on error, we may need to do logic here to change conclusion based on the continue on error result
step.ExecutionContext.Global.StepsContext.SetOutcome(step.ExecutionContext.ScopeName, step.ExecutionContext.ContextName, (step.ExecutionContext.Result ?? TaskResult.Succeeded).ToActionResult());
step.ExecutionContext.Global.StepsContext.SetConclusion(step.ExecutionContext.ScopeName, step.ExecutionContext.ContextName, (step.ExecutionContext.Result ?? TaskResult.Succeeded).ToActionResult());
}
}
} }
} }