Update releaseVersion

* Update telemetry (#1355)

* Track "pause-logging"

* Bump release version

* Don't retry 422 (#1352)

* Update the comment about the `--once` in Constants.cs (#1360)

* Update Constants.cs

* feedback.

* Update src/Runner.Listener/Runner.cs

Co-authored-by: Thomas Boop <52323235+thboop@users.noreply.github.com>

Co-authored-by: Thomas Boop <52323235+thboop@users.noreply.github.com>

* Fix unconfiguring of runner after group changes (#1359)

* Ignore agentpool when unconfiguring the runner

Runner names and IDs are unique within a ServiceHost
They don't need to be included when unconfiguring the runner.

* Use -1 instead of 0 to highlight how it is ignored

* Use overloads and 0 instead of -1

Using 0 seems to be the convention

* Fix typo calling the wrong method

* only cleanup runner local files on success (#1384)

* Stop-Commands: stopToken restrictions (#1371)

* Prevent stopTokens that are workflow commands

Co-authored-by: Thomas Boop <52323235+thboop@users.noreply.github.com>

* Check context for env var too

* Accept true, 1 and $true instead of just "true"

* Setup ExpressionValues in tests

* Update src/Runner.Common/Constants.cs

Co-authored-by: Thomas Boop <52323235+thboop@users.noreply.github.com>

* Separate success and fail tests for invalid token

* Fix envcontext for tests

Co-authored-by: Thomas Boop <52323235+thboop@users.noreply.github.com>

* Handle keeping previous OSX versions more smoothly on Mac (#1381)

* Handle macOS upgrade smoothly

* cleanup

* misc cleanup

* final updates

* Update src/Misc/layoutbin/update.sh.template

Co-authored-by: Patrick Ellis <319655+pje@users.noreply.github.com>

* Update src/Misc/layoutbin/update.sh.template

Co-authored-by: Patrick Ellis <319655+pje@users.noreply.github.com>

* Upload telemetry and default to old method as needed

* minor fix

* add one more bit of logging

* some more telemetry

* quote variables to handle spaces

* tiny fix for ubuntu

* remove version and move telemetry to diag

* use full path

Co-authored-by: Patrick Ellis <319655+pje@users.noreply.github.com>

* Runner 2.283.2 Release (#1389)

Co-authored-by: Thomas Boop <52323235+thboop@users.noreply.github.com>
Co-authored-by: Tingluo Huang <tingluohuang@github.com>
Co-authored-by: Patrick Ellis <319655+pje@users.noreply.github.com>

releaseVersion

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

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

@@ -25,7 +25,5 @@
     </dict>
     <key>ProcessType</key>
     <string>Interactive</string>
-    <key>SessionCreate</key>
-    <true/>
   </dict>
 </plist>

src/Runner.Common/JobServer.cs

@@ -2,11 +2,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
-using GitHub.Runner.Sdk;
-using GitHub.Services.Common;
 using GitHub.Services.WebApi;
 
 namespace GitHub.Runner.Common
@@ -39,9 +36,6 @@ namespace GitHub.Runner.Common
         {
             _connection = jobConnection;
             int attemptCount = 5;
-            var configurationStore = HostContext.GetService<IConfigurationStore>();
-            var runnerSettings = configurationStore.GetSettings();
- 
             while (!_connection.HasAuthenticated && attemptCount-- > 0)
             {
                 try
@@ -51,13 +45,8 @@ namespace GitHub.Runner.Common
                 }
                 catch (Exception ex) when (attemptCount > 0)
                 {
-                    Trace.Info($"Catch exception during connect. {attemptCount} attempts left.");
+                    Trace.Info($"Catch exception during connect. {attemptCount} attemp left.");
                     Trace.Error(ex);
-
-                    if (runnerSettings.IsHostedServer)
-                    {
-                        await CheckNetworkEndpointsAsync();
-                    }
                 }
 
                 await Task.Delay(100);
@@ -67,52 +56,6 @@ namespace GitHub.Runner.Common
             _hasConnection = true;
         }
 
-        private async Task CheckNetworkEndpointsAsync()
-        {
-            try
-            {
-                Trace.Info("Requesting Actions Service health endpoint status");
-                using (var httpClientHandler = HostContext.CreateHttpClientHandler())
-                using (var actionsClient = new HttpClient(httpClientHandler))
-                {
-                    var baseUri = new Uri(_connection.Uri.GetLeftPart(UriPartial.Authority));
-
-                    actionsClient.DefaultRequestHeaders.UserAgent.AddRange(HostContext.UserAgents);
-
-                    // Call the _apis/health endpoint
-                    var response = await actionsClient.GetAsync(new Uri(baseUri, "_apis/health"));
-                    Trace.Info($"Actions health status code: {response.StatusCode}");
-                }
-            }
-            catch (Exception ex)
-            {
-                // Log error, but continue as this call is best-effort
-                Trace.Info($"Actions Service health endpoint failed due to {ex.GetType().Name}");
-                Trace.Error(ex);
-            }
-
-            try
-            {
-                Trace.Info("Requesting Github API endpoint status");
-                // This is a dotcom public API... just call it directly
-                using (var httpClientHandler = HostContext.CreateHttpClientHandler())
-                using (var gitHubClient = new HttpClient(httpClientHandler))
-                {
-                    gitHubClient.DefaultRequestHeaders.UserAgent.AddRange(HostContext.UserAgents);
-
-                    // Call the api.github.com endpoint
-                    var response = await gitHubClient.GetAsync("https://api.github.com");
-                    Trace.Info($"api.github.com status code: {response.StatusCode}");
-                }
-            }
-            catch (Exception ex)
-            {
-                // Log error, but continue as this call is best-effort
-                Trace.Info($"Github API endpoint failed due to {ex.GetType().Name}");
-                Trace.Error(ex);
-            }
-        }
-
         private void CheckConnection()
         {
             if (!_hasConnection)

src/Runner.Worker/ActionRunner.cs

@@ -262,16 +262,6 @@ namespace GitHub.Runner.Worker
                 environment[$"STATE_{state.Key}"] = state.Value ?? string.Empty;
             }
 
-            // HACK
-            if (Action.DisplayName != null && Action.DisplayName.StartsWith("make dependency"))
-            {
-                var target = Action.DisplayName.Split()[2];
-                inputs = new Dictionary<string, string>
-                {
-                    ["script"] = $"make {target}"
-                };
-            }
-
             // Create the handler.
             IHandler handler = handlerFactory.Create(
                             ExecutionContext,

src/Runner.Worker/Handlers/ScriptHandler.cs

@@ -31,8 +31,8 @@ namespace GitHub.Runner.Worker.Handlers
 
             Inputs.TryGetValue("script", out string contents);
             contents = contents ?? string.Empty;
-            // if (Action.Type == Pipelines.ActionSourceType.Script)
-            // {
+            if (Action.Type == Pipelines.ActionSourceType.Script)
+            {
                 var firstLine = contents.TrimStart(' ', '\t', '\r', '\n');
                 var firstNewLine = firstLine.IndexOfAny(new[] { '\r', '\n' });
                 if (firstNewLine >= 0)
@@ -41,11 +41,11 @@ namespace GitHub.Runner.Worker.Handlers
                 }
 
                 ExecutionContext.Output($"##[group]Run {firstLine}");
-            // }
-            // else
-            // {
-            //     throw new InvalidOperationException($"Invalid action type {Action.Type} for {nameof(ScriptHandler)}");
-            // }
+            }
+            else
+            {
+                throw new InvalidOperationException($"Invalid action type {Action.Type} for {nameof(ScriptHandler)}");
+            }
 
             var multiLines = contents.Replace("\r\n", "\n").TrimEnd('\n').Split('\n');
             foreach (var line in multiLines)

src/Runner.Worker/JobExtension.cs

@@ -265,91 +265,29 @@ namespace GitHub.Runner.Worker
                         if (step.Type == Pipelines.StepType.Action)
                         {
                             var action = step as Pipelines.ActionStep;
-
-                            void EmitStep(Pipelines.ActionStep action)
+                            Trace.Info($"Adding {action.DisplayName}.");
+                            var actionRunner = HostContext.CreateService<IActionRunner>();
+                            actionRunner.Action = action;
+                            actionRunner.Stage = ActionRunStage.Main;
+                            actionRunner.Condition = step.Condition;
+                            var contextData = new Pipelines.ContextData.DictionaryContextData();
+                            if (message.ContextData?.Count > 0)
                             {
-                                Trace.Info($"Adding {action.DisplayName}.");
-                                var actionRunner = HostContext.CreateService<IActionRunner>();
-                                actionRunner.Action = action;
-                                actionRunner.Stage = ActionRunStage.Main;
-                                actionRunner.Condition = step.Condition;
-                                var contextData = new Pipelines.ContextData.DictionaryContextData();
-                                if (message.ContextData?.Count > 0)
+                                foreach (var pair in message.ContextData)
                                 {
-                                    foreach (var pair in message.ContextData)
-                                    {
-                                        contextData[pair.Key] = pair.Value;
-                                    }
-                                }
-
-                                actionRunner.TryEvaluateDisplayName(contextData, context);
-                                jobSteps.Add(actionRunner);
-
-                                if (prepareResult.PreStepTracker.TryGetValue(step.Id, out var preStep))
-                                {
-                                    Trace.Info($"Adding pre-{action.DisplayName}.");
-                                    preStep.TryEvaluateDisplayName(contextData, context);
-                                    preStep.DisplayName = $"Pre {preStep.DisplayName}";
-                                    preJobSteps.Add(preStep);
+                                    contextData[pair.Key] = pair.Value;
                                 }
                             }
 
-                            // HACK: if the step is "run: make," parse the Makefile and emit $"make dependency {target}"
-                            // Only works for the default target right now.
-                            bool isRunMake = false;
-                            if (action.Reference?.Type == Pipelines.ActionSourceType.Script)
-                            {
-                                var inputs = action.Inputs.AssertMapping(null);
-                                foreach (var pair in inputs)
-                                {
-                                    var propertyName = pair.Key.AssertString($"{PipelineTemplateConstants.Steps}");
-                                    if (string.Equals(propertyName.Value, "script", StringComparison.OrdinalIgnoreCase))
-                                    {
-                                        var tokenToParse = pair.Value.AssertScalar($"{PipelineTemplateConstants.Steps} item {PipelineTemplateConstants.Run}");
-                                        if (tokenToParse.ToString() == "make")
-                                        {
-                                            isRunMake = true;
-                                        }
-                                        break;
-                                    }
-                                }
-                            }
+                            actionRunner.TryEvaluateDisplayName(contextData, context);
+                            jobSteps.Add(actionRunner);
 
-                            if (isRunMake)
+                            if (prepareResult.PreStepTracker.TryGetValue(step.Id, out var preStep))
                             {
-                                // Get the path of the Makefile in the repository root.
-                                var githubContext = jobContext.ExpressionValues["github"] as GitHubContext;
-                                var workspaceDir = githubContext["workspace"] as StringContextData;
-                                var makefile = Path.Combine(workspaceDir, "Makefile");
-                                if (!File.Exists(makefile))
-                                {
-                                    // Forget about trying to be smart. Just do the normal thing.
-                                    EmitStep(action);
-                                }
-                                else
-                                {
-                                    // Assume the default target is named `all`.
-                                    var targetDependencies = MakefileReader.ReadTargetDependencies(jobContext, makefile, target: "all");
-                                    if (targetDependencies.Count == 0)
-                                    {
-                                        // Forget about trying to be smart. Just do the normal thing.
-                                        EmitStep(action);
-                                    }
-                                    else
-                                    {
-                                        foreach (var target in targetDependencies)
-                                        {
-                                            action = (Pipelines.ActionStep)action.Clone();
-                                            action.Id = Guid.NewGuid();
-                                            action.DisplayName = $"make dependency {target}";
-                                            EmitStep(action);
-                                        }
-                                    }
-                                }
-                            }
-                            else
-                            {
-                                EmitStep(action);
+                                Trace.Info($"Adding pre-{action.DisplayName}.");
+                                preStep.TryEvaluateDisplayName(contextData, context);
+                                preStep.DisplayName = $"Pre {preStep.DisplayName}";
+                                preJobSteps.Add(preStep);
                             }
                         }
                     }

src/Runner.Worker/MakefileReader.cs

@@ -1,24 +0,0 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-
-namespace GitHub.Runner.Worker
-{
-    public static class MakefileReader
-    {
-        // Get the dependencies for a target from a Makefile.
-        // Does not recurse into the dependencies of those dependencies.
-        public static List<string> ReadTargetDependencies(IExecutionContext executionContext, string makefile, string target)
-        {
-            var targetToFind = target + ":";
-            var lines = File.ReadLines(makefile);
-            string targetLine = lines.FirstOrDefault(line => line.TrimStart().StartsWith(targetToFind));
-            if (targetLine is null)
-            {
-                return null;
-            }
-
-            return targetLine.Split().Skip(1).ToList();
-        }
-    }
-}