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

Fix Workflow Step Env overiding Parent Env

Browse Source
This commit is contained in:
Ethan Chiu
2020-06-25 13:53:41 -04:00
parent 1f6518dfad
commit 57d59fcd6e
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,7 +58,7 @@ namespace GitHub.Runner.Worker.Handlers
var envData = new Dictionary<string, string>(); var envData = new Dictionary<string, string>();
// Copy over parent environment // Copy over parent environment
foreach (var env in ExecutionContext.EnvironmentVariables) foreach (var env in Environment)
{ {
envData[env.Key] = env.Value; envData[env.Key] = env.Value;
} }

3
src/Sdk/DTPipelines/Pipelines/ObjectTemplating/PipelineTemplateEvaluator.cs
View File

@@ -160,8 +160,7 @@ namespace GitHub.DistributedTask.Pipelines.ObjectTemplating
} }
public List<ActionStep> LoadCompositeSteps( public List<ActionStep> LoadCompositeSteps(
TemplateToken token TemplateToken token)
)
{ {
var result = default(List<ActionStep>); var result = default(List<ActionStep>);
if (token != null && token.Type != TokenType.Null) if (token != null && token.Type != TokenType.Null)