Composite Run Steps Refactoring

src/Runner.Common/Util/EncodingUtil.cs

@@ -0,0 +1,51 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using GitHub.Runner.Sdk;
+using GitHub.Runner.Common;
+
+namespace GitHub.Runner.Common.Util
+{
+    public static class EncodingUtil
+    {
+        public static async Task SetEncoding(IHostContext hostContext, Tracing trace, CancellationToken cancellationToken)
+        {
+#if OS_WINDOWS
+            try
+            {
+                if (Console.InputEncoding.CodePage != 65001)
+                {
+                    using (var p = hostContext.CreateService<IProcessInvoker>())
+                    {
+                        // Use UTF8 code page
+                        int exitCode = await p.ExecuteAsync(workingDirectory: hostContext.GetDirectory(WellKnownDirectory.Work),
+                                                fileName: WhichUtil.Which("chcp", true, trace),
+                                                arguments: "65001",
+                                                environment: null,
+                                                requireExitCodeZero: false,
+                                                outputEncoding: null,
+                                                killProcessOnCancel: false,
+                                                redirectStandardIn: null,
+                                                inheritConsoleHandler: true,
+                                                cancellationToken: cancellationToken);
+                        if (exitCode == 0)
+                        {
+                            trace.Info("Successfully returned to code page 65001 (UTF8)");
+                        }
+                        else
+                        {
+                            trace.Warning($"'chcp 65001' failed with exit code {exitCode}");
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                trace.Warning($"'chcp 65001' failed with exception {ex.Message}");
+            }
+#endif
+            // Dummy variable to prevent compiler error CS1998: "This async method lacks 'await' operators and will run synchronously..."
+            await Task.CompletedTask;
+        }
+    }
+}

src/Runner.Worker/ActionManifestManager.cs

@@ -30,8 +30,6 @@ public interface IActionManifestManager : IRunnerService
         Dictionary<string, string> EvaluateContainerEnvironment(IExecutionContext executionContext, MappingToken token, IDictionary<string, PipelineContextData> extraExpressionValues);
 
         string EvaluateDefaultInput(IExecutionContext executionContext, string inputName, TemplateToken token);
-
-        void SetAllCompositeOutputs(IExecutionContext parentExecutionContext, DictionaryContextData actionOutputs);
     }
 
     public sealed class ActionManifestManager : RunnerService, IActionManifestManager
@@ -170,34 +168,6 @@ public ActionDefinitionData Load(IExecutionContext executionContext, string mani
             return actionDefinition;
         }
 
-        public void SetAllCompositeOutputs(
-            IExecutionContext parentExecutionContext,
-            DictionaryContextData actionOutputs)
-        {
-            // Each pair is structured like this
-            // We ignore "description" for now
-            // {
-            //   "the-output-name": {
-            //     "description": "",
-            //     "value": "the value"
-            //   },
-            //   ...
-            // }
-            foreach (var pair in actionOutputs)
-            {
-                var outputsName = pair.Key;
-                var outputsAttributes = pair.Value as DictionaryContextData;
-                outputsAttributes.TryGetValue("value", out var val);
-                var outputsValue = val as StringContextData;
-
-                // Set output in the whole composite scope. 
-                if (!String.IsNullOrEmpty(outputsName) && !String.IsNullOrEmpty(outputsValue))
-                {
-                    parentExecutionContext.SetOutput(outputsName, outputsValue, out _);
-                }
-            }
-        }
-
         public DictionaryContextData EvaluateCompositeOutputs(
             IExecutionContext executionContext,
             TemplateToken token,

src/Runner.Worker/ExecutionContext.cs

@@ -70,8 +70,6 @@ public interface IExecutionContext : IRunnerService
 
         bool EchoOnActionCommand { get; set; }
 
-        IExecutionContext FinalizeContext { get; set; }
-
         // Initialize
         void InitializeJob(Pipelines.AgentJobRequestMessage message, CancellationToken token);
         void CancelToken();
@@ -107,7 +105,7 @@ public interface IExecutionContext : IRunnerService
         // others
         void ForceTaskComplete();
         void RegisterPostJobStep(IStep step);
-        IStep RegisterNestedStep(IActionRunner step, DictionaryContextData inputsData, int location, Dictionary<string, string> envData, bool cleanUp = false);
+        IStep CreateCompositeStep(IActionRunner step, DictionaryContextData inputsData, Dictionary<string, string> envData);
     }
 
     public sealed class ExecutionContext : RunnerService, IExecutionContext
@@ -174,8 +172,6 @@ public sealed class ExecutionContext : RunnerService, IExecutionContext
 
         public bool EchoOnActionCommand { get; set; }
 
-        public IExecutionContext FinalizeContext { get; set; }
-
         public TaskResult? Result
         {
             get
@@ -276,12 +272,10 @@ public void RegisterPostJobStep(IStep step)
         /// Helper function used in CompositeActionHandler::RunAsync to
         /// add a child node, aka a step, to the current job to the Root.JobSteps based on the location. 
         /// </summary>
-        public IStep RegisterNestedStep(
+        public IStep CreateCompositeStep(
             IActionRunner step,
             DictionaryContextData inputsData,
-            int location,
-            Dictionary<string, string> envData,
-            bool cleanUp = false)
+            Dictionary<string, string> envData)
         {
             // If the context name is empty and the scope name is empty, we would generate a unique scope name for this child in the following format:
             // "__<GUID>"
@@ -297,12 +291,6 @@ public IStep RegisterNestedStep(
 
             step.ExecutionContext.ExpressionValues["inputs"] = inputsData;
 
-            // Set Parent Attribute for Clean Up Step
-            if (cleanUp)
-            {
-                step.ExecutionContext.FinalizeContext = this;
-            }
-
             // Add the composite action environment variables to each step.
 #if OS_WINDOWS
             var envContext = new DictionaryContextData();
@@ -315,8 +303,6 @@ public IStep RegisterNestedStep(
             }
             step.ExecutionContext.ExpressionValues["env"] = envContext;
 
-            Root.JobSteps.Insert(location, step);
-
             return step;
         }