Download action repos into directory

This reverts commit a22fcbc036.

src/Runner.Worker/ActionManifestManager.cs

@@ -30,6 +30,8 @@ namespace GitHub.Runner.Worker
         Dictionary<string, string> EvaluateContainerEnvironment(IExecutionContext executionContext, MappingToken token, IDictionary<string, PipelineContextData> extraExpressionValues);
 
         string EvaluateDefaultInput(IExecutionContext executionContext, string inputName, TemplateToken token);
+
+        // string EvaluateDefaultInputInsideComposite(IExecutionContext executionContext, string inputName, TemplateToken token);
     }
 
     public sealed class ActionManifestManager : RunnerService, IActionManifestManager
@@ -282,6 +284,9 @@ namespace GitHub.Runner.Worker
             if (token != null)
             {
                 var templateContext = CreateTemplateContext(executionContext);
+                Trace.Info($"Template context GitHub: {StringUtil.ConvertToJson(templateContext.ExpressionValues["github"])}");
+
+                Trace.Info($"Template context keys: {StringUtil.ConvertToJson(templateContext.ExpressionValues.Keys)}");
                 try
                 {
                     var evaluateResult = TemplateEvaluator.Evaluate(templateContext, "input-default-context", token, 0, null, omitHeader: true);
@@ -304,6 +309,83 @@ namespace GitHub.Runner.Worker
             return result;
         }
 
+        // public string EvaluateDefaultInputInsideComposite(
+        //     IExecutionContext executionContext,
+        //     string inputName,
+        //     TemplateToken token)
+        // {
+        //     string result = "";
+        //     if (token != null)
+        //     {
+        //         // Add GitHub Expression Values
+        //         var githubContext = executionContext.ExpressionValues["github"];
+        //         Trace.Info($"GitHub Context EvaluateDefaultInputInsideComposite: {StringUtil.ConvertToJson(githubContext)}");
+
+        //         var temp = new Dictionary<string, PipelineContextData>();
+        //         temp["github"] = githubContext;
+
+        //         // Trace.Info($"Token: {StringUtil.ConvertToJson(token)}");
+
+        //         var templateContext = CreateTemplateContext(executionContext, temp);
+        //         try
+        //         {
+
+        //             var evaluateResult = TemplateEvaluator.Evaluate(templateContext, "uses-input", token, 0, null, omitHeader: true);
+
+        //             Trace.Info($"Input '{inputName}': default value evaluate result: {StringUtil.ConvertToJson(evaluateResult)}");
+        //             templateContext.Errors.Check();
+
+        //             // Can't evaluate the default github.respository, etc.
+
+
+        //             // TODO: restrict to only be used for composite "uses" steps
+        //             // Find better way to isolate only 
+        //             // We could create a whitelist for just checkout?
+        //             // (ex: "repo", "token", etc.)
+        //             // if (evaluateResult is BasicExpressionToken)
+        //             // {
+                        
+
+        //             //     // var evaluateResult2 = TemplateEvaluator.Evaluate(templateContext, "step-with", token, 0, null, omitHeader: true);
+        //             //     // templateContext.Errors.Check();
+
+        //             //     // Trace.Info($"Test2 Input '{inputName}': default value evaluate result: {StringUtil.ConvertToJson(evaluateResult2)}");
+        //             //     // var result2 = evaluateResult2.AssertString($"default value for input '{inputName}'").Value;
+
+        //             //     // TODO 6/28 => Try just getting it from the getgithubcontext lmao.
+
+        //             //     // Trace.Info($"Basic expr token: {evaluateResult}");
+
+        //             //     var stringVersion = evaluateResult.AssertString($"default value for input '{inputName}'").Value;
+
+        //             //     // no we have to use the template evaluator since it's a
+
+        //             //     // var githubTokenSplit = 
+
+        //             //     // // Evaluate it
+        //             //     // var evaluateResult = executionContext.GetGitHubContext("");
+
+        //             //     return result2;
+        //             // }
+
+        //             // Trace.Info($"Input '{inputName}': default value evaluate result: {StringUtil.ConvertToJson(evaluateResult)}");
+
+        //             // String
+        //             result = evaluateResult.AssertString($"default value for input '{inputName}'").Value;
+        //         }
+        //         catch (Exception ex) when (!(ex is TemplateValidationException))
+        //         {
+        //             Trace.Error(ex);
+        //             templateContext.Errors.Add(ex);
+        //         }
+
+        //         templateContext.Errors.Check();
+        //     }
+
+        //     return result;
+
+        // }
+
         private TemplateContext CreateTemplateContext(
             IExecutionContext executionContext,
             IDictionary<string, PipelineContextData> extraExpressionValues = null)

src/Runner.Worker/ActionRunner.cs

@@ -169,6 +169,25 @@ namespace GitHub.Runner.Worker
                 validInputs.Add("entryPoint");
                 validInputs.Add("args");
             }
+
+            Trace.Info($"Repo: {ExecutionContext.GetGitHubContext("repository")}");
+
+            // Since we don't pass the GitHub Context attributes to the composite action,
+            // We need to explitly set the default values of certain things we need like the 
+            // default repository 
+
+            // if (ExecutionContext.GetGitHubContext("repository") == null)
+            // {
+            //     ExecutionContext.SetGitHubContext("repository", definition.Directory);
+            // }
+
+            // var githubContext = ExecutionContext.ExpressionValues["github"] as GitHubContext;
+
+            // foreach (var pair in githubContext)
+            // {
+            //     ExecutionContext.SetGitHubContext(pair.Key, pair.Value as StringContextData);
+            // }
+            
             // Merge the default inputs from the definition
             if (definition.Data?.Inputs != null)
             {
@@ -179,7 +198,17 @@ namespace GitHub.Runner.Worker
                     validInputs.Add(key);
                     if (!inputs.ContainsKey(key))
                     {
+                        Trace.Info($"Definition Input Key: {key}");
+                        // if (ExecutionContext.InsideComposite)
+                        // {
+                        //     inputs[key] = manifestManager.EvaluateDefaultInputInsideComposite(ExecutionContext, key, input.Value);
+                        // }
+                        // else
+                        // {
+                        //     inputs[key] = manifestManager.EvaluateDefaultInput(ExecutionContext, key, input.Value);
+                        // }
                         inputs[key] = manifestManager.EvaluateDefaultInput(ExecutionContext, key, input.Value);
+                        Trace.Info($"Definition Input Value: {inputs[key]}");
                     }
                 }
             }

src/Runner.Worker/Handlers/CompositeActionHandler.cs

@@ -5,11 +5,14 @@ using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using GitHub.DistributedTask.Expressions2;
 using GitHub.DistributedTask.ObjectTemplating.Tokens;
 using GitHub.DistributedTask.Pipelines.ContextData;
+using GitHub.DistributedTask.Pipelines.ObjectTemplating;
 using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Common;
 using GitHub.Runner.Sdk;
+using GitHub.Runner.Worker.Expressions;
 using Pipelines = GitHub.DistributedTask.Pipelines;
 
 
@@ -35,6 +38,8 @@ namespace GitHub.Runner.Worker.Handlers
             var githubContext = ExecutionContext.ExpressionValues["github"] as GitHubContext;
             ArgUtil.NotNull(githubContext, nameof(githubContext));
 
+            // Trace.Info($"Github Context: {StringUtil.ConvertToJson(githubContext)}");
+
             // Resolve action steps
             var actionSteps = Data.Steps;
 
@@ -45,6 +50,8 @@ namespace GitHub.Runner.Worker.Handlers
                 inputsData[i.Key] = new StringContextData(i.Value);
             }
 
+            Trace.Info($"Composite Actions Inputs {StringUtil.ConvertToJson(inputsData)}");
+
             // Initialize Composite Steps List of Steps
             var compositeSteps = new List<IStep>();
 
@@ -64,6 +71,10 @@ namespace GitHub.Runner.Worker.Handlers
                 compositeGitHubContext[pair.Key] = pair.Value;
             }
 
+            // Download all data
+            var actionManager = HostContext.GetService<IActionManager>();
+            await actionManager.PrepareActionsAsync(ExecutionContext, actionSteps);
+
             foreach (Pipelines.ActionStep actionStep in actionSteps)
             {
                 var actionRunner = HostContext.CreateService<IActionRunner>();
@@ -76,6 +87,7 @@ namespace GitHub.Runner.Worker.Handlers
                 // Set GITHUB_ACTION_PATH
                 step.ExecutionContext.ExpressionValues["github"] = compositeGitHubContext;
                 step.ExecutionContext.SetGitHubContext("action_path", ActionDirectory);
+                step.ExecutionContext.ExpressionFunctions.Add(new FunctionInfo<HashFilesFunction>(PipelineTemplateConstants.HashFiles, 1, byte.MaxValue));
 
                 compositeSteps.Add(step);
             }
@@ -150,6 +162,7 @@ namespace GitHub.Runner.Worker.Handlers
         {
             ArgUtil.NotNull(compositeSteps, nameof(compositeSteps));
 
+
             // The parent StepsRunner of the whole Composite Action Step handles the cancellation stuff already. 
             foreach (IStep step in compositeSteps)
             {

src/Runner.Worker/action_yaml.json

@@ -109,9 +109,15 @@
         },
         "composite-steps": {
             "sequence": {
-                "item-type": "composite-step"
+                "item-type": "composite-step-types"
             }
         },
+        "composite-step-types": {
+            "one-of": [
+                "composite-step",
+                "uses-step"
+            ]
+        },
         "composite-step": {
             "mapping": {
                 "properties": {
@@ -130,6 +136,20 @@
                 }
             }
         },
+        "uses-step": {
+            "mapping": {
+                "properties": {
+                    "name": "string-steps-context",
+                    "id": "non-empty-string",
+                    "uses": {
+                        "type": "non-empty-string",
+                        "required": true
+                    },
+                    "with": "step-with",
+                    "env": "step-env"
+                }
+            }
+        },
         "container-runs-context": {
             "context": [
                 "inputs"
@@ -195,6 +215,37 @@
                 "loose-key-type": "non-empty-string",
                 "loose-value-type": "string"
             }
+        },
+        "step-with": {
+            "context": [
+                "github",
+                "inputs",
+                "strategy",
+                "matrix",
+                "steps",
+                "job",
+                "runner",
+                "env",
+                "hashFiles(1,255)"
+            ],
+            "mapping": {
+                "loose-key-type": "non-empty-string",
+                "loose-value-type": "string"
+            }
+        },
+        "uses-input": {
+            "context": [
+                "github",
+                "inputs",
+                "strategy",
+                "matrix",
+                "steps",
+                "job",
+                "runner",
+                "env",
+                "hashFiles(1,255)"
+            ],
+            "string": {}
         }
     }
-}
+}

src/runnerversion

@@ -1 +1 @@
-2.272.0
+2.274.0