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

revert

Browse Source
This commit is contained in:
Ethan Chiu
2020-07-21 17:55:34 -04:00
parent 143266bc96
commit 5dfb2cc552
3 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Runner.Worker/ActionManifestManager.cs
View File

@@ -375,7 +375,7 @@ namespace GitHub.Runner.Worker
var postToken = default(StringToken); var postToken = default(StringToken);
var postEntrypointToken = default(StringToken); var postEntrypointToken = default(StringToken);
var postIfToken = default(StringToken); var postIfToken = default(StringToken);
var steps = default(List<Pipelines.ActionStep>); var steps = default(List<Pipelines.Step>);
foreach (var run in runsMapping) foreach (var run in runsMapping)
{ {
@@ -488,7 +488,7 @@ namespace GitHub.Runner.Worker
{ {
return new CompositeActionExecutionData() return new CompositeActionExecutionData()
{ {
Steps = steps, Steps = steps.Cast<Pipelines.ActionStep>().ToList(),
Outputs = outputs Outputs = outputs
}; };
} }

13
src/Runner.Worker/ExecutionContext.cs
View File

@@ -60,12 +60,10 @@ namespace GitHub.Runner.Worker
bool EchoOnActionCommand { get; set; } bool EchoOnActionCommand { get; set; }
bool IsComposite { get; }
// Initialize // Initialize
void InitializeJob(Pipelines.AgentJobRequestMessage message, CancellationToken token); void InitializeJob(Pipelines.AgentJobRequestMessage message, CancellationToken token);
void CancelToken(); void CancelToken();
IExecutionContext CreateChild(Guid recordId, string displayName, string refName, string scopeName, string contextName, Dictionary<string, string> intraActionState = null, int? recordOrder = null, IPagingLogger logger = null, bool isComposite = false); IExecutionContext CreateChild(Guid recordId, string displayName, string refName, string scopeName, string contextName, Dictionary<string, string> intraActionState = null, int? recordOrder = null, IPagingLogger logger = null);
// logging // logging
long Write(string tag, string message); long Write(string tag, string message);
@@ -128,7 +126,6 @@ namespace GitHub.Runner.Worker
// only job level ExecutionContext will track throttling delay. // only job level ExecutionContext will track throttling delay.
private long _totalThrottlingDelayInMilliseconds = 0; private long _totalThrottlingDelayInMilliseconds = 0;
public Guid Id => _record.Id; public Guid Id => _record.Id;
public string ScopeName { get; private set; } public string ScopeName { get; private set; }
public string ContextName { get; private set; } public string ContextName { get; private set; }
@@ -151,8 +148,6 @@ namespace GitHub.Runner.Worker
// Only job level ExecutionContext has StepsWithPostRegistered // Only job level ExecutionContext has StepsWithPostRegistered
public HashSet<Guid> StepsWithPostRegistered { get; private set; } public HashSet<Guid> StepsWithPostRegistered { get; private set; }
public bool IsComposite { get; private set; }
public bool EchoOnActionCommand { get; set; } public bool EchoOnActionCommand { get; set; }
public TaskResult? Result public TaskResult? Result
@@ -259,7 +254,7 @@ namespace GitHub.Runner.Worker
DictionaryContextData inputsData, DictionaryContextData inputsData,
Dictionary<string, string> envData) Dictionary<string, string> envData)
{ {
step.ExecutionContext = Root.CreateChild(_record.Id, step.DisplayName, _record.Id.ToString("N"), scopeName, step.Action.ContextName, logger: _logger, isComposite: true); step.ExecutionContext = Root.CreateChild(_record.Id, step.DisplayName, _record.Id.ToString("N"), scopeName, step.Action.ContextName, logger: _logger);
step.ExecutionContext.ExpressionValues["inputs"] = inputsData; step.ExecutionContext.ExpressionValues["inputs"] = inputsData;
step.ExecutionContext.ExpressionValues["steps"] = Global.StepsContext.GetScope(step.ExecutionContext.GetFullyQualifiedContextName()); step.ExecutionContext.ExpressionValues["steps"] = Global.StepsContext.GetScope(step.ExecutionContext.GetFullyQualifiedContextName());
@@ -278,7 +273,7 @@ namespace GitHub.Runner.Worker
return step; return step;
} }
public IExecutionContext CreateChild(Guid recordId, string displayName, string refName, string scopeName, string contextName, Dictionary<string, string> intraActionState = null, int? recordOrder = null, IPagingLogger logger = null, bool isComposite = false) public IExecutionContext CreateChild(Guid recordId, string displayName, string refName, string scopeName, string contextName, Dictionary<string, string> intraActionState = null, int? recordOrder = null, IPagingLogger logger = null)
{ {
Trace.Entering(); Trace.Entering();
@@ -325,8 +320,6 @@ namespace GitHub.Runner.Worker
child._logger.Setup(_mainTimelineId, recordId); child._logger.Setup(_mainTimelineId, recordId);
} }
child.IsComposite = isComposite;
return child; return child;
} }

4
src/Sdk/DTPipelines/Pipelines/ObjectTemplating/PipelineTemplateConverter.cs
View File

@@ -17,13 +17,13 @@ namespace GitHub.DistributedTask.Pipelines.ObjectTemplating
[EditorBrowsable(EditorBrowsableState.Never)] [EditorBrowsable(EditorBrowsableState.Never)]
public static class PipelineTemplateConverter public static class PipelineTemplateConverter
{ {
public static List<ActionStep> ConvertToSteps( public static List<Step> ConvertToSteps(
TemplateContext context, TemplateContext context,
TemplateToken steps) TemplateToken steps)
{ {
var stepsSequence = steps.AssertSequence($"job {PipelineTemplateConstants.Steps}"); var stepsSequence = steps.AssertSequence($"job {PipelineTemplateConstants.Steps}");
var result = new List<ActionStep>(); var result = new List<Step>();
var nameBuilder = new ReferenceNameBuilder(); var nameBuilder = new ReferenceNameBuilder();
foreach (var stepsItem in stepsSequence) foreach (var stepsItem in stepsSequence)
{ {