Prepare 2.163.1 runner release (#233)

* Bring back tools folder fallback code (#232) * Prepare 2.163.1 runner release
actions · Dec 18, 2019 · b15230f · b15230f
1 parent 9bbbca9
commit b15230f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/releaseNote.md b/releaseNote.md
@@ -1,14 +1,11 @@
 ## Features
-  - Added Proxy Support for self-hosted runner. (#206)
-  - Introduce `--name` configure argument for runner name. (#217)
-  - Better repo matching for issue file path (checkout v2 related) (#208)
+  - N/A
 
 ## Bugs
-  - N/A
+  - Fix scenario where Tool Cache folder in "Hosted macOS" environments was empty (#232)
 
 ## Misc
-  - Runner code cleanup  (#197, #209, #214, #219) 
-  - Update node external to 12.13.1 (#215)
+  - 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

diff --git a/src/Runner.Common/Constants.cs b/src/Runner.Common/Constants.cs
@@ -208,6 +208,11 @@ public static class Actions
                 public static readonly string StepDebug = "ACTIONS_STEP_DEBUG";
             }
 
+            public static class Agent
+            {
+                public static readonly string ToolsDirectory = "agent.ToolsDirectory";
+            }
+
             public static class System
             {
                 //

diff --git a/src/Runner.Common/HostContext.cs b/src/Runner.Common/HostContext.cs
@@ -246,8 +246,9 @@ public string GetDirectory(WellKnownDirectory directory)
                     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(

diff --git a/src/runnerversion b/src/runnerversion
@@ -1 +1 @@
-2.163.0
+2.163.1