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

Merge branch 'users/ethanchewy/compositetest2' of https://github.com/actions/runner into users/ethanchewy/compositeenv

Browse Source
This commit is contained in:
Ethan Chiu
2020-06-18 16:14:41 -04:00
parent 6552263369 180a687f30
commit 66cadebeb8
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Runner.Worker/ActionManager.cs
View File

@@ -397,7 +397,8 @@ namespace GitHub.Runner.Worker
}
else if (definition.Data.Execution.ExecutionType == ActionExecutionType.Composite && !String.IsNullOrEmpty(Environment.GetEnvironmentVariable("TESTING_COMPOSITE_ACTIONS_ALPHA")))
{
// Don't do anything for now
var compositeAction = definition.Data.Execution as CompositeActionExecutionData;
Trace.Info($"Action steps: {compositeAction.Steps}.");
}
else
{

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

@@ -291,8 +291,6 @@ namespace GitHub.Runner.Worker
// placed after the queued composite steps
// This will take only O(n+m) time which would be just as efficient if we refactored the code of JobSteps to a PriorityQueue
// This temp Queue is created in the CompositeActionHandler.
Trace.Info("Adding Composite Action Step");
var newGuid = Guid.NewGuid();
step.ExecutionContext = Root.CreateChild(newGuid, step.DisplayName, newGuid.ToString("N"), null, null);
step.ExecutionContext.ExpressionValues["inputs"] = inputsData;
@@ -319,7 +317,6 @@ namespace GitHub.Runner.Worker
Root.JobSteps.Clear();
foreach (var cs in steps)
{
Trace.Info($"EnqueueAllCompositeSteps : Adding Composite action step {cs}");
Root.JobSteps.Enqueue(cs);
}
foreach (var s in temp)
@@ -332,7 +329,6 @@ namespace GitHub.Runner.Worker
Root.JobSteps = new Queue<IStep>();
foreach (var cs in steps)
{
Trace.Info($"EnqueueAllCompositeSteps : Adding Composite action step {cs}");
Root.JobSteps.Enqueue(cs);
}
}