Remove passing context to all composite steps attribuyte

This reverts commit a22fcbc036.

.github/workflows/release.yml

@@ -1,7 +1,6 @@
 name: Runner CD
 
 on:
-  workflow_dispatch:
   push:
     paths:
     - releaseVersion

releaseNote.md

@@ -1,15 +1,18 @@
 ## Features
-  - Composite Actions Support for Multiple Run Steps (#549, #557, #564, #568, #569, #578, #591, #599, #605, #609, #610, #615, #624) 
+  - Resolve action download info from server (#508, #515, #550)
-  - Prepare to switch GITHUB_ACTION to use ContextName instead of refname (#593)
+  - Print runner and machine name to log. (#539)
-  - Fold logs for intermediate docker commands (#608)
-  - Add ability to register a runner to the non-default self-hosted runner group (#613)
-  
 ## Bugs
-  - Double quotes around variable so CD works if path contains spaces (#602)
+  - Reduce input validation warnings (#506) 
-  - Bump lodash in /src/Misc/expressionFunc/hashFiles (#603) 
+  - Fix null ref exception in SecretMasker caused by `hashfiles` timeout. (#516)
-  - Fix poor performance of process spawned from svc daemon (#614)
+  - Add libicu66 to `./installDependencies.sh` for Ubuntu 20.04 (#535)
+  - Fix DataContract with Token service (#532)
+  - Skip search $PATH on command with fully qualified path (#526)
+  - Restore SELinux context on service file when SELinux is enabled (#525)
 ## Misc
-  - Move shared ExecutionContext properties under .Global (#594)
+  - Remove SPS/Token migration code. Remove GHES url manipulate code. (#513) 
+  - Add sub-step for developer flow for clarity (#523)
+  - Update Links and Language to Git + VSCode (#522)
+  - Update runner configuration exception message (#540)
 
 ## Windows x64
 We recommend configuring the runner in a root folder of the Windows drive (e.g. "C:\actions-runner"). This will help avoid issues related to service identity folder permissions and long file path restrictions on Windows.

releaseVersion

@@ -1 +1 @@
-2.272.0
+<Update to ./src/runnerversion when creating release>

src/Misc/layoutbin/actions.runner.plist.template

@@ -23,7 +23,5 @@
       <key>ACTIONS_RUNNER_SVC</key>
       <string>1</string>
     </dict>
-    <key>ProcessType</key>
-    <string>Interactive</string>
   </dict>
 </plist>

src/Runner.Worker/ActionManager.cs

@@ -395,7 +395,7 @@ namespace GitHub.Runner.Worker
                             Trace.Info($"Action cleanup plugin: {plugin.PluginTypeName}.");
                         }
                     }
-                    else if (definition.Data.Execution.ExecutionType == ActionExecutionType.Composite)
+                    else if (definition.Data.Execution.ExecutionType == ActionExecutionType.Composite && !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("TESTING_COMPOSITE_ACTIONS_ALPHA")))
                     {
                         var compositeAction = definition.Data.Execution as CompositeActionExecutionData;
                         Trace.Info($"Load {compositeAction.Steps?.Count ?? 0} action steps.");
@@ -1048,7 +1048,7 @@ namespace GitHub.Runner.Worker
                     Trace.Info($"Action plugin: {(actionDefinitionData.Execution as PluginActionExecutionData).Plugin}, no more preparation.");
                     return null;
                 }
-                else if (actionDefinitionData.Execution.ExecutionType == ActionExecutionType.Composite)
+                else if (actionDefinitionData.Execution.ExecutionType == ActionExecutionType.Composite && !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("TESTING_COMPOSITE_ACTIONS_ALPHA")))
                 {
                     Trace.Info($"Action composite: {(actionDefinitionData.Execution as CompositeActionExecutionData).Steps}, no more preparation.");
                     return null;

src/Runner.Worker/ActionManifestManager.cs

@@ -105,8 +105,13 @@ namespace GitHub.Runner.Worker
                             break;
 
                         case "outputs":
+                            if (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("TESTING_COMPOSITE_ACTIONS_ALPHA")))
+                            {
                                 actionOutputs = actionPair.Value.AssertMapping("outputs");
                                 break;
+                            }
+                            Trace.Info($"Ignore action property outputs. Outputs for a whole action is not supported yet.");
+                            break;
 
                         case "description":
                             actionDefinition.Description = actionPair.Value.AssertString("description").Value;
@@ -418,10 +423,14 @@ namespace GitHub.Runner.Worker
                         preIfToken = run.Value.AssertString("pre-if");
                         break;
                     case "steps":
+                        if (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("TESTING_COMPOSITE_ACTIONS_ALPHA")))
+                        {
                             var stepsToken = run.Value.AssertSequence("steps");
                             steps = PipelineTemplateConverter.ConvertToSteps(templateContext, stepsToken);
                             templateContext.Errors.Check();
                             break;
+                        }
+                        throw new Exception("You aren't supposed to be using Composite Actions yet!");
                     default:
                         Trace.Info($"Ignore run property {runsKey}.");
                         break;
@@ -469,7 +478,7 @@ namespace GitHub.Runner.Worker
                         };
                     }
                 }
-                else if (string.Equals(usingToken.Value, "composite", StringComparison.OrdinalIgnoreCase))
+                else if (string.Equals(usingToken.Value, "composite", StringComparison.OrdinalIgnoreCase) && !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("TESTING_COMPOSITE_ACTIONS_ALPHA")))
                 {
                     if (steps == null)
                     {

src/Runner.Worker/GitHubContext.cs

@@ -9,7 +9,6 @@ namespace GitHub.Runner.Worker
         private readonly HashSet<string> _contextEnvWhitelist = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
         {
             "action",
-            "action_path",
             "actor",
             "api_url",
             "base_ref",

src/Runner.Worker/Handlers/CompositeActionHandler.cs

@@ -56,14 +56,6 @@ namespace GitHub.Runner.Worker.Handlers
                 childScopeName = $"__{Guid.NewGuid()}";
             }
 
-            // Copy the github context so that we don't modify the original pointer
-            // We can't use PipelineContextData.Clone() since that creates a null pointer exception for copying a GitHubContext
-            var compositeGitHubContext = new GitHubContext();
-            foreach (var pair in githubContext)
-            {
-                compositeGitHubContext[pair.Key] = pair.Value;
-            }
-
             foreach (Pipelines.ActionStep actionStep in actionSteps)
             {
                 var actionRunner = HostContext.CreateService<IActionRunner>();
@@ -72,11 +64,6 @@ namespace GitHub.Runner.Worker.Handlers
                 actionRunner.Condition = actionStep.Condition;
 
                 var step = ExecutionContext.CreateCompositeStep(childScopeName, actionRunner, inputsData, Environment);
-
-                // Set GITHUB_ACTION_PATH
-                step.ExecutionContext.ExpressionValues["github"] = compositeGitHubContext;
-                step.ExecutionContext.SetGitHubContext("action_path", ActionDirectory);
-
                 compositeSteps.Add(step);
             }
 
@@ -189,6 +176,9 @@ namespace GitHub.Runner.Worker.Handlers
 
                 var actionStep = step as IActionRunner;
 
+                // Set GITHUB_ACTION
+                step.ExecutionContext.SetGitHubContext("action", step.ExecutionContext.GetFullyQualifiedContextName());
+
                 try
                 {
                     // Evaluate and merge action's env block to env context

src/runnerversion

@@ -1 +1 @@
-2.272.0
+2.267.0