From 50d979f1b2e32b3bcd4801dd6324fbd42044af2a Mon Sep 17 00:00:00 2001 From: Julio Barba Date: Tue, 17 Dec 2019 18:21:13 -0500 Subject: [PATCH] Bring back tools folder fallback code (#232) --- src/Runner.Common/Constants.cs | 5 +++++ src/Runner.Common/HostContext.cs | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Runner.Common/Constants.cs b/src/Runner.Common/Constants.cs index e0781c21f..c2d7d5396 100644 --- a/src/Runner.Common/Constants.cs +++ b/src/Runner.Common/Constants.cs @@ -189,6 +189,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 791966c0f..f110bbd40 100644 --- a/src/Runner.Common/HostContext.cs +++ b/src/Runner.Common/HostContext.cs @@ -229,8 +229,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(