undo change

This commit is contained in:
Salman Chishti
2025-07-25 15:53:51 +00:00
parent 28532dd72a
commit 32215aece6

View File

@@ -1,102 +1,39 @@
using System; using System;
using System.Collections.Generic; using System.Collections.ObjectModel;
using GitHub.DistributedTask.WebApi;
using GitHub.Runner.Common.Util;
using Pipelines = GitHub.DistributedTask.Pipelines;
using GitHub.Runner.Common;
using GitHub.Runner.Sdk;
namespace GitHub.Runner.Worker.Handlers namespace GitHub.Runner.Common.Util
{ {
[ServiceLocator(Default = typeof(HandlerFactory))] public static class NodeUtil
public interface IHandlerFactory : IRunnerService
{ {
IHandler Create( private const string _defaultNodeVersion = "node20";
IExecutionContext executionContext, public static readonly ReadOnlyCollection<string> BuiltInNodeVersions = new(new[] { "node20" });
Pipelines.ActionStepDefinitionReference action, public static string GetInternalNodeVersion()
IStepHost stepHost,
ActionExecutionData data,
Dictionary<string, string> inputs,
Dictionary<string, string> environment,
Variables runtimeVariables,
string actionDirectory,
List<JobExtensionRunner> localActionContainerSetupSteps);
}
public sealed class HandlerFactory : RunnerService, IHandlerFactory
{
public IHandler Create(
IExecutionContext executionContext,
Pipelines.ActionStepDefinitionReference action,
IStepHost stepHost,
ActionExecutionData data,
Dictionary<string, string> inputs,
Dictionary<string, string> environment,
Variables runtimeVariables,
string actionDirectory,
List<JobExtensionRunner> localActionContainerSetupSteps)
{ {
// Validate args. var forcedInternalNodeVersion = Environment.GetEnvironmentVariable(Constants.Variables.Agent.ForcedInternalNodeVersion);
Trace.Entering(); var isForcedInternalNodeVersion = !string.IsNullOrEmpty(forcedInternalNodeVersion) && BuiltInNodeVersions.Contains(forcedInternalNodeVersion);
ArgUtil.NotNull(executionContext, nameof(executionContext));
ArgUtil.NotNull(stepHost, nameof(stepHost));
ArgUtil.NotNull(data, nameof(data));
ArgUtil.NotNull(inputs, nameof(inputs));
ArgUtil.NotNull(environment, nameof(environment));
ArgUtil.NotNull(runtimeVariables, nameof(runtimeVariables));
// Create the handler. if (isForcedInternalNodeVersion)
IHandler handler;
if (data.ExecutionType == ActionExecutionType.Container)
{ {
handler = HostContext.CreateService<IContainerActionHandler>(); return forcedInternalNodeVersion;
(handler as IContainerActionHandler).Data = data as ContainerActionExecutionData;
} }
else if (data.ExecutionType == ActionExecutionType.NodeJS) return _defaultNodeVersion;
{ }
handler = HostContext.CreateService<INodeScriptActionHandler>();
var nodeData = data as NodeJSActionExecutionData;
// With node12 EoL in 04/2022 and node16 EoL in 09/23, we want to execute all JS actions using node20 /// <summary>
if (string.Equals(nodeData.NodeVersion, "node12", StringComparison.InvariantCultureIgnoreCase) || /// Checks if Node24 is requested but running on ARM32 Linux, and determines if fallback is needed.
string.Equals(nodeData.NodeVersion, "node16", StringComparison.InvariantCultureIgnoreCase)) /// </summary>
{ /// <param name="preferredVersion">The preferred Node version</param>
nodeData.NodeVersion = "node20"; /// <returns>A tuple containing the adjusted node version and an optional warning message</returns>
} public static (string nodeVersion, string warningMessage) CheckNodeVersionForLinuxArm32(string preferredVersion)
{
(handler as INodeScriptActionHandler).Data = nodeData; if (string.Equals(preferredVersion, "node24", StringComparison.OrdinalIgnoreCase) &&
} Constants.Runner.PlatformArchitecture.Equals(Constants.Architecture.Arm) &&
else if (data.ExecutionType == ActionExecutionType.Script) Constants.Runner.Platform.Equals(Constants.OSPlatform.Linux))
{ {
handler = HostContext.CreateService<IScriptHandler>(); return ("node20", "Node 24 is not supported on Linux ARM32 platforms. Falling back to Node 20.");
(handler as IScriptHandler).Data = data as ScriptActionExecutionData;
}
else if (data.ExecutionType == ActionExecutionType.Plugin)
{
// Runner plugin
handler = HostContext.CreateService<IRunnerPluginHandler>();
(handler as IRunnerPluginHandler).Data = data as PluginActionExecutionData;
}
else if (data.ExecutionType == ActionExecutionType.Composite)
{
handler = HostContext.CreateService<ICompositeActionHandler>();
(handler as ICompositeActionHandler).Data = data as CompositeActionExecutionData;
}
else
{
// This should never happen.
throw new NotSupportedException(data.ExecutionType.ToString());
} }
handler.Action = action; return (preferredVersion, null);
handler.Environment = environment;
handler.RuntimeVariables = runtimeVariables;
handler.ExecutionContext = executionContext;
handler.StepHost = stepHost;
handler.Inputs = inputs;
handler.ActionDirectory = actionDirectory;
handler.LocalActionContainerSetupSteps = localActionContainerSetupSteps;
return handler;
} }
} }
} }