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

rename nestedSteps to embeddedSteps (#1071)

Browse Source
This commit is contained in:
eric sciple
2021-05-01 12:51:01 -05:00
committed by GitHub
parent 7cc689b0d9
commit 419ed24c1e
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,8 +49,8 @@ namespace GitHub.Runner.Worker.Handlers
childScopeName = $"__{Guid.NewGuid()}"; childScopeName = $"__{Guid.NewGuid()}";
} }
// Create nested steps // Create embedded steps
var nestedSteps = new List<IStep>(); var embeddedSteps = new List<IStep>();
foreach (Pipelines.ActionStep stepData in Data.Steps) foreach (Pipelines.ActionStep stepData in Data.Steps)
{ {
var step = HostContext.CreateService<IActionRunner>(); var step = HostContext.CreateService<IActionRunner>();
@@ -70,11 +70,11 @@ namespace GitHub.Runner.Worker.Handlers
// Set GITHUB_ACTION_PATH // Set GITHUB_ACTION_PATH
step.ExecutionContext.SetGitHubContext("action_path", ActionDirectory); step.ExecutionContext.SetGitHubContext("action_path", ActionDirectory);
nestedSteps.Add(step); embeddedSteps.Add(step);
} }
// Run nested steps // Run embedded steps
await RunStepsAsync(nestedSteps); await RunStepsAsync(embeddedSteps);
// Set outputs // Set outputs
ExecutionContext.ExpressionValues["inputs"] = inputsData; ExecutionContext.ExpressionValues["inputs"] = inputsData;
@@ -134,16 +134,16 @@ namespace GitHub.Runner.Worker.Handlers
} }
} }
private async Task RunStepsAsync(List<IStep> nestedSteps) private async Task RunStepsAsync(List<IStep> embeddedSteps)
{ {
ArgUtil.NotNull(nestedSteps, nameof(nestedSteps)); ArgUtil.NotNull(embeddedSteps, nameof(embeddedSteps));
foreach (IStep step in nestedSteps) foreach (IStep step in embeddedSteps)
{ {
Trace.Info($"Processing nested step: DisplayName='{step.DisplayName}'"); Trace.Info($"Processing embedded step: DisplayName='{step.DisplayName}'");
// Initialize env context // Initialize env context
Trace.Info("Initialize Env context for nested step"); Trace.Info("Initialize Env context for embedded step");
#if OS_WINDOWS #if OS_WINDOWS
var envContext = new DictionaryContextData(); var envContext = new DictionaryContextData();
#else #else
@@ -175,7 +175,7 @@ namespace GitHub.Runner.Worker.Handlers
try try
{ {
// Evaluate and merge nested-step env // Evaluate and merge embedded-step env
var templateEvaluator = step.ExecutionContext.ToPipelineTemplateEvaluator(); var templateEvaluator = step.ExecutionContext.ToPipelineTemplateEvaluator();
var actionEnvironment = templateEvaluator.EvaluateStepEnvironment(actionStep.Action.Environment, step.ExecutionContext.ExpressionValues, step.ExecutionContext.ExpressionFunctions, Common.Util.VarUtil.EnvironmentVariableKeyComparer); var actionEnvironment = templateEvaluator.EvaluateStepEnvironment(actionStep.Action.Environment, step.ExecutionContext.ExpressionValues, step.ExecutionContext.ExpressionFunctions, Common.Util.VarUtil.EnvironmentVariableKeyComparer);
foreach (var env in actionEnvironment) foreach (var env in actionEnvironment)
@@ -186,7 +186,7 @@ namespace GitHub.Runner.Worker.Handlers
catch (Exception ex) catch (Exception ex)
{ {
// Evaluation error // Evaluation error
Trace.Info("Caught exception from expression for nested step.env"); Trace.Info("Caught exception from expression for embedded step.env");
step.ExecutionContext.Error(ex); step.ExecutionContext.Error(ex);
step.ExecutionContext.Complete(TaskResult.Failed); step.ExecutionContext.Complete(TaskResult.Failed);
} }