From b15230f7a1f631ecfce58207b9a9c733fa01503f Mon Sep 17 00:00:00 2001
From: Julio Barba <juliobbv@github.com>
Date: Tue, 17 Dec 2019 19:19:40 -0500
Subject: [PATCH] Prepare 2.163.1 runner release (#233)

* Bring back tools folder fallback code (#232)
* Prepare 2.163.1 runner release
---
 releaseNote.md                   | 11 ++++-------
 src/Runner.Common/Constants.cs   |  5 +++++
 src/Runner.Common/HostContext.cs |  5 +++--
 src/runnerversion                |  2 +-
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/releaseNote.md b/releaseNote.md
index 5d553bca1..754d013ae 100644
--- 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)
-
-## Bugs
   - N/A
 
+## Bugs
+  - 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
index f4211ce91..cb433de14 100644
--- a/src/Runner.Common/Constants.cs
+++ b/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
             {
                 //
diff --git a/src/Runner.Common/HostContext.cs b/src/Runner.Common/HostContext.cs
index f49932adc..dccac8563 100644
--- a/src/Runner.Common/HostContext.cs
+++ b/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(
diff --git a/src/runnerversion b/src/runnerversion
index 02391d948..8570a1f3b 100644
--- a/src/runnerversion
+++ b/src/runnerversion
@@ -1 +1 @@
-2.163.0
+2.163.1