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

Resolve build errors

Browse Source
This commit is contained in:
Ethan Chiu
2020-06-15 09:12:54 -04:00
parent 885a128fa5
commit 85796d0011
3 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,7 @@ namespace GitHub.Runner.Worker.Handlers
{
// Just keep as same as ScriptHandler.cs for now
var target = Data.Steps;
var runStepInputs= target[0].Inputs;
var runStepInputs = target[0].Inputs;
var templateEvaluator = ExecutionContext.ToPipelineTemplateEvaluator();
var inputs = templateEvaluator.EvaluateStepInputs(runStepInputs, ExecutionContext.ExpressionValues, ExecutionContext.ExpressionFunctions);
var taskManager = HostContext.GetService<IActionManager>();
@@ -61,7 +61,7 @@ namespace GitHub.Runner.Worker.Handlers
throw new InvalidOperationException($"Invalid action type {Action.Type} for {nameof(ScriptHandler)}");
}
ar multiLines = contents.Replace("\r\n", "\n").TrimEnd('\n').Split('\n');
var multiLines = contents.Replace("\r\n", "\n").TrimEnd('\n').Split('\n');
foreach (var line in multiLines)
{
// Bright Cyan color
@@ -143,7 +143,7 @@ namespace GitHub.Runner.Worker.Handlers
ExecutionContext.Output("##[endgroup]");
}
public async Task RunAsync(ActionRunStage stage)
public async Task RunAsync(ActionRunStage stage)
{
// DELETE LATER
// await Task.Yield();
@@ -172,7 +172,7 @@ namespace GitHub.Runner.Worker.Handlers
// For now, just assume it is 1 Run step
// 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?
var runStepInputs= target[0].Inputs;
var runStepInputs = target[0].Inputs;
var templateEvaluator = ExecutionContext.ToPipelineTemplateEvaluator();
var inputs = templateEvaluator.EvaluateStepInputs(runStepInputs, ExecutionContext.ExpressionValues, ExecutionContext.ExpressionFunctions);
var taskManager = HostContext.GetService<IActionManager>();
@@ -227,7 +227,24 @@ namespace GitHub.Runner.Worker.Handlers
// Detect operating system for fileName + arguments
var contents = runValue ?? string.Empty;
string workingDirectory = null;
if (!Inputs.TryGetValue("workingDirectory", out workingDirectory))
{
// TODO: figure out how defaults interact with template later
// for now, we won't check job.defaults if we are inside a template.
if (string.IsNullOrEmpty(ExecutionContext.ScopeName) && ExecutionContext.JobDefaults.TryGetValue("run", out var runDefaults))
{
if (runDefaults.TryGetValue("working-directory", out workingDirectory))
{
ExecutionContext.Debug("Overwrite 'working-directory' base on job defaults.");
}
}
}
var workspaceDir = githubContext["workspace"] as StringContextData;
workingDirectory = Path.Combine(workspaceDir, workingDirectory ?? string.Empty);
string shell = null;
if (!Inputs.TryGetValue("shell", out shell) || string.IsNullOrEmpty(shell))
{
@@ -361,6 +378,5 @@ namespace GitHub.Runner.Worker.Handlers
}
}
}
}
}
}

4
src/Runner.Worker/Handlers/HandlerFactory.cs
View File

@@ -70,9 +70,9 @@ namespace GitHub.Runner.Worker.Handlers
{
// TODO
// Runner plugin
handler = HostContext.CreateService<ICompositeHandler>();
handler = HostContext.CreateService<ICompositeActionHandler>();
// handler = CompositeHandler;
(handler as ICompositeHandler).Data = data as CompositeActionExecutionData;
(handler as ICompositeActionHandler).Data = data as CompositeActionExecutionData;
}
else
{

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

@@ -289,8 +289,8 @@ namespace GitHub.Runner.Worker
// TODO: Maybe add EvaluateStep stuff here too?
// TODO: INSERT CONVERTSTEPS FUNCTION HERE FOR EVALUATING STEPS
// Maybe we don't need to do this here do we need to initialize the job?
context.Debug("Evaluating job evaluating steps");
var stepsEvaluation = templateEvaluator.EvaluateSteps(contextData, context, context.ExpressionFunctions);
// context.Debug("Evaluating job evaluating steps");
// var stepsEvaluation = templateEvaluator.EvaluateSteps(contextData, context, context.ExpressionFunctions);
////////
}