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

Progress towards passing FileTable or FileID or FileName

Browse Source
This commit is contained in:
Ethan Chiu
2020-06-22 18:29:48 -04:00
parent 43a3006e7b
commit 58d11ef80a
7 changed files with 54 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,7 +100,7 @@ namespace GitHub.Runner.Worker
break;
case "runs":
actionDefinition.Execution = ConvertRuns(executionContext, context, actionPair.Value, envComposite, fileId);
actionDefinition.Execution = ConvertRuns(executionContext, context, actionPair.Value, fileId, envComposite);
break;
default:
@@ -235,7 +235,7 @@ namespace GitHub.Runner.Worker
var context = CreateContext(executionContext, extraExpressionValues);
try
{
var evaluateResult = TemplateEvaluator.Evaluate(context, "runs-env", token, 0, fileID, omitHeader: true);
var evaluateResult = TemplateEvaluator.Evaluate(context, "runs-env", token, 0, fileID, omitHeader: false);
context.Errors.Check();
// Mapping
@@ -349,9 +349,12 @@ namespace GitHub.Runner.Worker
IExecutionContext executionContext,
TemplateContext context,
TemplateToken inputsToken,
MappingToken envComposite = null,
Int32 fileID = default(Int32))
Int32 fileID,
MappingToken envComposite = null
)
{
Trace.Info($"COMPOSITE ACTIONS FILEID: {fileID}");
var runsMapping = inputsToken.AssertMapping("runs");
var usingToken = default(StringToken);
var imageToken = default(StringToken);
@@ -415,9 +418,15 @@ namespace GitHub.Runner.Worker
case "steps":
if (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("TESTING_COMPOSITE_ACTIONS_ALPHA")))
{
Trace.Info($"COMPOSITE ACTIONS FILEID inside steps case: {fileID}");
Trace.Info($"COMPOSITE ACTIONS file name inside steps case {context.GetFileName(fileID)}");
// File name is loaded correctly!!
// WHY DOESN'T THE CONTEXT GET PASED DOWN CORRECTLY?
var steps = run.Value.AssertSequence("steps");
var evaluator = executionContext.ToPipelineTemplateEvaluator();
stepsLoaded = evaluator.LoadCompositeSteps(steps, fileID);
// stepsLoaded = evaluator.LoadCompositeSteps(steps, context.GetFileTable(), fileID);
string fileName = context.GetFileName(fileID);
stepsLoaded = evaluator.LoadCompositeSteps(steps, fileName);
break;
}
throw new Exception("You aren't supposed to be using Composite Actions yet!");