set context name for pre/post steps for composite actions

This commit is contained in:
Thomas Boop
2021-08-03 21:46:15 +00:00
parent 3851acd0cf
commit fc57c796ce
2 changed files with 4 additions and 4 deletions

View File

@@ -272,7 +272,7 @@ namespace GitHub.Runner.Worker
return; return;
} }
step.ExecutionContext = Root.CreatePostChild(step.DisplayName, IntraActionState); step.ExecutionContext = Root.CreatePostChild(step.DisplayName, IntraActionState, this.ScopeName);
Root.PostJobSteps.Push(step); Root.PostJobSteps.Push(step);
} }
@@ -914,7 +914,7 @@ namespace GitHub.Runner.Worker
} }
} }
private IExecutionContext CreatePostChild(string displayName, Dictionary<string, string> intraActionState) private IExecutionContext CreatePostChild(string displayName, Dictionary<string, string> intraActionState, string scopeName)
{ {
if (!_expandedForPostJob) if (!_expandedForPostJob)
{ {
@@ -924,7 +924,7 @@ namespace GitHub.Runner.Worker
} }
var newGuid = Guid.NewGuid(); var newGuid = Guid.NewGuid();
return CreateChild(newGuid, displayName, newGuid.ToString("N"), null, null, intraActionState, _childTimelineRecordOrder - Root.PostJobSteps.Count); return CreateChild(newGuid, displayName, newGuid.ToString("N"), null, scopeName, intraActionState, _childTimelineRecordOrder - Root.PostJobSteps.Count);
} }
} }

View File

@@ -312,7 +312,7 @@ namespace GitHub.Runner.Worker
{ {
ArgUtil.NotNull(actionStep, step.DisplayName); ArgUtil.NotNull(actionStep, step.DisplayName);
Guid stepId = Guid.NewGuid(); Guid stepId = Guid.NewGuid();
actionStep.ExecutionContext = jobContext.CreateChild(stepId, actionStep.DisplayName, stepId.ToString("N"), null, null, intraActionStates[actionStep.Action.Id]); actionStep.ExecutionContext = jobContext.CreateChild(stepId, actionStep.DisplayName, stepId.ToString("N"), null, actionStep.Action.ContextName, intraActionStates[actionStep.Action.Id]);
} }
} }