actions/runner
1
0
Fork 0
mirror of https://github.com/actions/runner.git synced 2025-12-17 15:59:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set github action path at step level instead of global scope to avoid necessary removal

Browse Source
This commit is contained in:
Ethan Chiu
2020-07-27 11:30:35 -04:00
parent 3393f3991c
commit fd75cdb8ab
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -98,7 +98,7 @@ namespace GitHub.Runner.Worker
// others // others
void ForceTaskComplete(); void ForceTaskComplete();
void RegisterPostJobStep(IStep step); void RegisterPostJobStep(IStep step);
IStep CreateCompositeStep(string scopeName, IActionRunner step, DictionaryContextData inputsData, Dictionary<string, string> envData); IStep CreateCompositeStep(string scopeName, IActionRunner step, DictionaryContextData inputsData, Dictionary<string, string> envData, string actionDirectory);
} }
public sealed class ExecutionContext : RunnerService, IExecutionContext public sealed class ExecutionContext : RunnerService, IExecutionContext
@@ -258,7 +258,8 @@ namespace GitHub.Runner.Worker
string scopeName, string scopeName,
IActionRunner step, IActionRunner step,
DictionaryContextData inputsData, DictionaryContextData inputsData,
Dictionary<string, string> envData) Dictionary<string, string> envData,
string actionDirectory)
{ {
step.ExecutionContext = Root.CreateChild(_record.Id, step.DisplayName, _record.Id.ToString("N"), scopeName, step.Action.ContextName, logger: _logger, insideComposite: true, cancellationTokenSource: CancellationTokenSource.CreateLinkedTokenSource(_cancellationTokenSource.Token)); step.ExecutionContext = Root.CreateChild(_record.Id, step.DisplayName, _record.Id.ToString("N"), scopeName, step.Action.ContextName, logger: _logger, insideComposite: true, cancellationTokenSource: CancellationTokenSource.CreateLinkedTokenSource(_cancellationTokenSource.Token));
step.ExecutionContext.ExpressionValues["inputs"] = inputsData; step.ExecutionContext.ExpressionValues["inputs"] = inputsData;
@@ -276,6 +277,9 @@ namespace GitHub.Runner.Worker
} }
step.ExecutionContext.ExpressionValues["env"] = envContext; step.ExecutionContext.ExpressionValues["env"] = envContext;
// Set GITHUB_ACTION_PATH for each step
step.ExecutionContext.SetGitHubContext("action_path", actionDirectory);
return step; return step;
} }

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

@@ -56,9 +56,6 @@ namespace GitHub.Runner.Worker.Handlers
childScopeName = $"__{Guid.NewGuid()}"; childScopeName = $"__{Guid.NewGuid()}";
} }
// Set GITHUB_ACTION_PATH
ExecutionContext.SetGitHubContext("action_path", ActionDirectory);
foreach (Pipelines.ActionStep actionStep in actionSteps) foreach (Pipelines.ActionStep actionStep in actionSteps)
{ {
var actionRunner = HostContext.CreateService<IActionRunner>(); var actionRunner = HostContext.CreateService<IActionRunner>();
@@ -66,7 +63,7 @@ namespace GitHub.Runner.Worker.Handlers
actionRunner.Stage = stage; actionRunner.Stage = stage;
actionRunner.Condition = actionStep.Condition; actionRunner.Condition = actionStep.Condition;
var step = ExecutionContext.CreateCompositeStep(childScopeName, actionRunner, inputsData, Environment); var step = ExecutionContext.CreateCompositeStep(childScopeName, actionRunner, inputsData, Environment, ActionDirectory);
compositeSteps.Add(step); compositeSteps.Add(step);
} }