actions/runner
1
0
Fork 0
mirror of https://github.com/actions/runner.git synced 2025-12-16 06:57:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

clean up

Browse Source
This commit is contained in:
Ethan Chiu
2020-06-18 15:57:23 -04:00
parent e56b2439b9
commit 6552263369
5 changed files with 18 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Runner.Worker/ActionManifestManager.cs
View File

@@ -183,7 +183,7 @@ namespace GitHub.Runner.Worker
var context = CreateContext(executionContext, extraExpressionValues);
try
{
var evaluateResult = TemplateEvaluator.Evaluate(context, "container-runs-env", token, 0, null, omitHeader: true);
var evaluateResult = TemplateEvaluator.Evaluate(context, "runs-env", token, 0, null, omitHeader: true);
context.Errors.Check();
Trace.Info($"Environments evaluate result: {StringUtil.ConvertToJson(evaluateResult)}");
@@ -215,8 +215,6 @@ namespace GitHub.Runner.Worker
return result;
}
// TODO: Add Evaluate Composite Action Env Function Here
// Steps will be evaluated already in StepsRunner
public Dictionary<string, string> EvaluateCompositeActionEnvironment(
IExecutionContext executionContext,
MappingToken token,
@@ -229,34 +227,19 @@ namespace GitHub.Runner.Worker
var context = CreateContext(executionContext, extraExpressionValues);
try
{
var evaluateResult = TemplateEvaluator.Evaluate(context, "container-runs-env", token, 0, null, omitHeader: true);
var evaluateResult = TemplateEvaluator.Evaluate(context, "runs-env", token, 0, null, omitHeader: true);
context.Errors.Check();
if (evaluateResult != null) {
Trace.Info($"EvaluateCompositeActionEnvironment evaluateResult {evaluateResult}");
} else {
Trace.Info($"EvaluateCompositeActionEnvironment evaluateResult is null");
}
Trace.Info($"Composite Action Environments evaluate result: {StringUtil.ConvertToJson(evaluateResult)}");
// Mapping
var mapping = evaluateResult.AssertMapping("composite env");
if (mapping != null) {
Trace.Info($"EvaluateCompositeActionEnvironment Mapping {mapping}");
} else {
Trace.Info($"EvaluateCompositeActionEnvironment Mapping is null");
}
foreach (var pair in mapping)
{
// Literal key
var key = pair.Key.AssertString("composite env key");
Trace.Info($"EvaluateCompositeActionEnvironment Key{key.Value}");
// Literal value
var value = pair.Value.AssertString("composite env value");
Trace.Info($"EvaluateCompositeActionEnvironment Value{value.Value}");
result[key.Value] = value.Value;
Trace.Info($"Add env {key} = {value}");