Prepare 2.163.1 runner release (#233)

* Bring back tools folder fallback code (#232)
* Prepare 2.163.1 runner release

releaseNote.md

@@ -1,13 +1,11 @@
 ## Features
-  - Added the "severity" keyword to allow action authors to set the default severity for problem matchers (#203)
+  - N/A
 
 ## Bugs
-  - Fixed generated self-hosted runner names to never go over 80 characters (helps Windows customers) (#193)
-  - Fixed `PrepareActions_DownloadActionFromGraph` test by pointing to an active Actions repository (#205)
+  - Fix scenario where Tool Cache folder in "Hosted macOS" environments was empty (#232)
 
 ## Misc
-  - Updated the publish and download artifact actions to use the v2 endpoint (#188)
-  - Updated the service name on self-hosted runner name to include repository or organization information (#193)
+  - N/A
 
 ## Windows x64
 We recommend configuring the runner under "<DRIVE>:\actions-runner". This will help avoid issues related to service identity folder permissions and long file path restrictions on Windows

src/Runner.Common/Constants.cs

@@ -208,6 +208,11 @@ namespace GitHub.Runner.Common
                 public static readonly string StepDebug = "ACTIONS_STEP_DEBUG";
             }
 
+            public static class Agent
+            {
+                public static readonly string ToolsDirectory = "agent.ToolsDirectory";
+            }
+
             public static class System
             {
                 //

src/Runner.Common/HostContext.cs

@@ -246,8 +246,9 @@ namespace GitHub.Runner.Common
                     break;
 
                 case WellKnownDirectory.Tools:
-                    path = Environment.GetEnvironmentVariable("RUNNER_TOOL_CACHE");
-                    
+                    // TODO: Coallesce to just check RUNNER_TOOL_CACHE when images stabilize
+                    path = Environment.GetEnvironmentVariable("RUNNER_TOOL_CACHE") ?? Environment.GetEnvironmentVariable("RUNNER_TOOLSDIRECTORY") ?? Environment.GetEnvironmentVariable("AGENT_TOOLSDIRECTORY") ?? Environment.GetEnvironmentVariable(Constants.Variables.Agent.ToolsDirectory);
+
                     if (string.IsNullOrEmpty(path))
                     {
                         path = Path.Combine(

src/Runner.Listener/Program.cs

@@ -4,6 +4,7 @@ using GitHub.Runner.Sdk;
 using System;
 using System.Globalization;
 using System.IO;
+using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
@@ -14,6 +15,9 @@ namespace GitHub.Runner.Listener
     {
         public static int Main(string[] args)
         {
+            // Add environment variables from .env file
+            LoadAndSetEnv();
+
             using (HostContext context = new HostContext("Runner"))
             {
                 return MainAsync(context, args).GetAwaiter().GetResult();
@@ -25,7 +29,7 @@ namespace GitHub.Runner.Listener
         // 1: Terminate failure
         // 2: Retriable failure
         // 3: Exit for self update
-        public async static Task<int> MainAsync(IHostContext context, string[] args)
+        private async static Task<int> MainAsync(IHostContext context, string[] args)
         {
             Tracing trace = context.GetTrace(nameof(GitHub.Runner.Listener));
             trace.Info($"Runner is built for {Constants.Runner.Platform} ({Constants.Runner.PlatformArchitecture}) - {BuildConstants.RunnerPackage.PackageName}.");
@@ -83,22 +87,6 @@ namespace GitHub.Runner.Listener
                     return Constants.Runner.ReturnCode.TerminatedError;
                 }
 
-                // Add environment variables from .env file
-                string envFile = Path.Combine(context.GetDirectory(WellKnownDirectory.Root), ".env");
-                if (File.Exists(envFile))
-                {
-                    var envContents = File.ReadAllLines(envFile);
-                    foreach (var env in envContents)
-                    {
-                        if (!string.IsNullOrEmpty(env) && env.IndexOf('=') > 0)
-                        {
-                            string envKey = env.Substring(0, env.IndexOf('='));
-                            string envValue = env.Substring(env.IndexOf('=') + 1);
-                            Environment.SetEnvironmentVariable(envKey, envValue);
-                        }
-                    }
-                }
-
                 // Parse the command line args.
                 var command = new CommandSettings(context, args);
                 trace.Info("Arguments parsed");
@@ -136,5 +124,34 @@ namespace GitHub.Runner.Listener
                 return Constants.Runner.ReturnCode.RetryableError;
             }
         }
+
+        private static void LoadAndSetEnv()
+        {
+            var binDir = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
+            var rootDir = new DirectoryInfo(binDir).Parent.FullName;
+            string envFile = Path.Combine(rootDir, ".env");
+            if (File.Exists(envFile))
+            {
+                var envContents = File.ReadAllLines(envFile);
+                foreach (var env in envContents)
+                {
+                    if (!string.IsNullOrEmpty(env))
+                    {
+                        var separatorIndex = env.IndexOf('=');
+                        if (separatorIndex > 0)
+                        {
+                            string envKey = env.Substring(0, separatorIndex);
+                            string envValue = null;
+                            if (env.Length > separatorIndex + 1)
+                            {
+                                envValue = env.Substring(separatorIndex + 1);
+                            }
+
+                            Environment.SetEnvironmentVariable(envKey, envValue);
+                        }
+                    }
+                }
+            }
+        }
     }
 }

src/runnerversion

@@ -1 +1 @@
-2.162.0
+2.163.1