From 21b49c542cdb8caf3c6217db6286fdefecb5f025 Mon Sep 17 00:00:00 2001 From: Philip Harrison Date: Fri, 26 May 2023 18:08:41 +0100 Subject: [PATCH] Set runner environment in context and env (#2518) * Set runner environment in runner context and env Extract runner_environment from the global context and expose in the `github.runner` context and env as `RUNNER_ENVIRONMENT`. Signed-off-by: Philip Harrison * encoding. --------- Signed-off-by: Philip Harrison Co-authored-by: Tingluo Huang --- src/Runner.Worker/JobRunner.cs | 5 +++++ src/Sdk/DTWebApi/WebApi/WellKnownDistributedTaskVariables.cs | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Runner.Worker/JobRunner.cs b/src/Runner.Worker/JobRunner.cs index 737ad6d85..2a540a730 100644 --- a/src/Runner.Worker/JobRunner.cs +++ b/src/Runner.Worker/JobRunner.cs @@ -150,6 +150,11 @@ namespace GitHub.Runner.Worker _runnerSettings = HostContext.GetService().GetSettings(); jobContext.SetRunnerContext("name", _runnerSettings.AgentName); + if (jobContext.Global.Variables.TryGetValue(WellKnownDistributedTaskVariables.RunnerEnvironment, out var runnerEnvironment)) + { + jobContext.SetRunnerContext("environment", runnerEnvironment); + } + string toolsDirectory = HostContext.GetDirectory(WellKnownDirectory.Tools); Directory.CreateDirectory(toolsDirectory); jobContext.SetRunnerContext("tool_cache", toolsDirectory); diff --git a/src/Sdk/DTWebApi/WebApi/WellKnownDistributedTaskVariables.cs b/src/Sdk/DTWebApi/WebApi/WellKnownDistributedTaskVariables.cs index 2b487e782..213117285 100644 --- a/src/Sdk/DTWebApi/WebApi/WellKnownDistributedTaskVariables.cs +++ b/src/Sdk/DTWebApi/WebApi/WellKnownDistributedTaskVariables.cs @@ -1,4 +1,4 @@ -using System; +using System; namespace GitHub.DistributedTask.WebApi { @@ -6,5 +6,6 @@ namespace GitHub.DistributedTask.WebApi { public static readonly String JobId = "system.jobId"; public static readonly String RunnerLowDiskspaceThreshold = "system.runner.lowdiskspacethreshold"; + public static readonly String RunnerEnvironment = "system.runnerEnvironment"; } }