From 6c4088457816ea646ca78dba5ea81a89545fdee3 Mon Sep 17 00:00:00 2001 From: Philip Harrison Date: Mon, 3 Apr 2023 12:08:49 +0100 Subject: [PATCH 1/2] 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 --- src/Runner.Worker/JobRunner.cs | 5 +++++ src/Sdk/DTWebApi/WebApi/WellKnownDistributedTaskVariables.cs | 1 + 2 files changed, 6 insertions(+) diff --git a/src/Runner.Worker/JobRunner.cs b/src/Runner.Worker/JobRunner.cs index f63fbf71776..49b9139eaf6 100644 --- a/src/Runner.Worker/JobRunner.cs +++ b/src/Runner.Worker/JobRunner.cs @@ -126,6 +126,11 @@ public async Task RunAsync(AgentJobRequestMessage message, Cancellat _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 2b487e78250..c6ca7b0b4f5 100644 --- a/src/Sdk/DTWebApi/WebApi/WellKnownDistributedTaskVariables.cs +++ b/src/Sdk/DTWebApi/WebApi/WellKnownDistributedTaskVariables.cs @@ -6,5 +6,6 @@ public static class WellKnownDistributedTaskVariables { public static readonly String JobId = "system.jobId"; public static readonly String RunnerLowDiskspaceThreshold = "system.runner.lowdiskspacethreshold"; + public static readonly String RunnerEnvironment = "system.runnerEnvironment"; } } From 361d7be735f6bf86170d34f7b7319bff2d21bc82 Mon Sep 17 00:00:00 2001 From: Tingluo Huang Date: Fri, 26 May 2023 15:40:57 +0000 Subject: [PATCH 2/2] encoding. --- src/Sdk/DTWebApi/WebApi/WellKnownDistributedTaskVariables.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Sdk/DTWebApi/WebApi/WellKnownDistributedTaskVariables.cs b/src/Sdk/DTWebApi/WebApi/WellKnownDistributedTaskVariables.cs index c6ca7b0b4f5..21311728520 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 {