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

Fix error + add diagnostics

Browse Source
This commit is contained in:
Ethan Chiu
2020-06-15 11:10:36 -04:00
parent e654a3e885
commit a0d93904ee
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,7 +45,7 @@ namespace GitHub.Runner.Worker.Handlers
} }
} }
var contents = runValue ?? string.Empty; var contents = runValue ?? string.Empty;
if (Action.Type == Pipelines.ActionSourceType.Script) if (Action.Type == Pipelines.ActionSourceType.Repository)
{ {
var firstLine = contents.TrimStart(' ', '\t', '\r', '\n'); var firstLine = contents.TrimStart(' ', '\t', '\r', '\n');
var firstNewLine = firstLine.IndexOfAny(new[] { '\r', '\n' }); var firstNewLine = firstLine.IndexOfAny(new[] { '\r', '\n' });
@@ -168,11 +168,22 @@ namespace GitHub.Runner.Worker.Handlers
// Resolve steps // Resolve steps
var target = Data.Steps; var target = Data.Steps;
if (target == null) {
Trace.Error("Data.Steps in CompositeActionHandler is null");
} else {
Trace.Info($"Data Steps Value for Composite Actions is: {target}.");
}
// For now, just assume it is 1 Run step // For now, just assume it is 1 Run step
// We will adapt this in the future. // We will adapt this in the future.
// Copied from ActionRunner.cs RunAsync() function => Maybe we don't need a handler and need to avoid this preplicatoin in the future? // Copied from ActionRunner.cs RunAsync() function => Maybe we don't need a handler and need to avoid this preplicatoin in the future?
var runStepInputs = target[0].Inputs; var runStepInputs = target[0].Inputs;
if (runStepInputs == null) {
Trace.Error("runStepInputs in CompositeActionHandler is null");
} else {
Trace.Info($"runStepInputs Value for Composite Actions is: {runStepInputs}.");
}
var templateEvaluator = ExecutionContext.ToPipelineTemplateEvaluator(); var templateEvaluator = ExecutionContext.ToPipelineTemplateEvaluator();
var inputs = templateEvaluator.EvaluateStepInputs(runStepInputs, ExecutionContext.ExpressionValues, ExecutionContext.ExpressionFunctions); var inputs = templateEvaluator.EvaluateStepInputs(runStepInputs, ExecutionContext.ExpressionValues, ExecutionContext.ExpressionFunctions);
var taskManager = HostContext.GetService<IActionManager>(); var taskManager = HostContext.GetService<IActionManager>();
@@ -183,7 +194,11 @@ namespace GitHub.Runner.Worker.Handlers
{ {
userInputs.Add(input.Key); userInputs.Add(input.Key);
userInputs.Add(input.Value); userInputs.Add(input.Value);
if (input.Key.Equals("run")) Trace.Info($"Composite Action Handler. Key: {input.Key} Value: {input.Value}");
// Why is the key should not be "run" => because the "run" keyword is recorgnized as something that will be a "script"?
// Or should we create another key that delineates between "script" and "run"?
// ^ Perhaps we can explore this in the next version with the changes the to action.yaml template
if (input.Key.Equals("script"))
{ {
runValue = input.Value; runValue = input.Value;
} }
@@ -198,6 +213,8 @@ namespace GitHub.Runner.Worker.Handlers
// In the future, we would apply and validate the template => maybe using the manifest manager to recursively load the json schema. // In the future, we would apply and validate the template => maybe using the manifest manager to recursively load the json schema.
} }
Trace.Info($"Run Value for Composite Actions is: {runValue}.");
// Let's think about validating inputs later // Let's think about validating inputs later
// Validate inputs only for actions with action.yml // Validate inputs only for actions with action.yml
// var unexpectedInputs = new List<string>(); // var unexpectedInputs = new List<string>();