actions/runner
1
0
Fork 0
mirror of https://github.com/actions/runner.git synced 2025-12-18 16:26:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

v2, including containers

Browse Source
This commit is contained in:
Chris Sidi
2020-05-19 22:43:35 -04:00
parent 904eb7df8a
commit fbd859454b
8 changed files with 51 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Runner.Worker/ActionManager.cs
View File

@@ -150,7 +150,8 @@ namespace GitHub.Runner.Worker
containerSetupSteps.Add(new JobExtensionRunner(runAsync: this.PullActionContainerAsync,
condition: $"{PipelineTemplateConstants.Success}()",
displayName: $"Pull {imageToPull.Key}",
data: new ContainerSetupInfo(imageToPull.Value, imageToPull.Key)));
data: new ContainerSetupInfo(imageToPull.Value, imageToPull.Key),
repositoryRef: null));
}
}
@@ -163,7 +164,8 @@ namespace GitHub.Runner.Worker
containerSetupSteps.Add(new JobExtensionRunner(runAsync: this.BuildActionContainerAsync,
condition: $"{PipelineTemplateConstants.Success}()",
displayName: $"Build {setupInfo.ActionRepository}",
data: new ContainerSetupInfo(imageToBuild.Value, setupInfo.Dockerfile, setupInfo.WorkingDirectory)));
data: new ContainerSetupInfo(imageToBuild.Value, setupInfo.Dockerfile, setupInfo.WorkingDirectory),
repositoryRef: setupInfo.RepositoryRef));
}
}
@@ -776,6 +778,7 @@ namespace GitHub.Runner.Worker
}
var setupInfo = new ActionContainer();
setupInfo.RepositoryRef = repositoryReference;
string destDirectory = Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Actions), repositoryReference.Name.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar), repositoryReference.Ref);
string actionEntryDirectory = destDirectory;
string dockerFileRelativePath = repositoryReference.Name;
@@ -1022,5 +1025,6 @@ namespace GitHub.Runner.Worker
public string Dockerfile { get; set; }
public string WorkingDirectory { get; set; }
public string ActionRepository { get; set; }
public Pipelines.RepositoryPathReference RepositoryRef { get; set; }
}
}

3
src/Runner.Worker/ContainerOperationProvider.cs
View File

@@ -46,7 +46,8 @@ namespace GitHub.Runner.Worker
var postJobStep = new JobExtensionRunner(runAsync: this.StopContainersAsync,
condition: $"{PipelineTemplateConstants.Always}()",
displayName: "Stop containers",
data: data);
data: data,
repositoryRef: null);
executionContext.Debug($"Register post job cleanup for stopping/deleting containers.");
executionContext.RegisterPostJobStep(postJobStep);

9
src/Runner.Worker/ExecutionContext.cs
View File

@@ -254,18 +254,13 @@ namespace GitHub.Runner.Worker
public void RegisterPostJobStep(IStep step)
{
var actionRunner = step as IActionRunner;
if (actionRunner != null && !Root.StepsWithPostRegistered.Add(actionRunner.Action.Id))
if (step is IActionRunner actionRunner && !Root.StepsWithPostRegistered.Add(actionRunner.Action.Id))
{
Trace.Info($"'post' of '{actionRunner.DisplayName}' already push to post step stack.");
return;
}
string refName = null;
if (actionRunner != null)
{
refName = actionRunner.Action.Reference.ToString();
}
string refName = step.GetRefName();
step.ExecutionContext = Root.CreatePostChild(step.DisplayName, refName, IntraActionState);
Root.PostJobSteps.Push(step);

22
src/Runner.Worker/IStepExtensions.cs Normal file
View File

@@ -0,0 +1,22 @@
using Newtonsoft.Json;
namespace GitHub.Runner.Worker
{
public static class IStepExtensions
{
public static string GetRefName(this IStep step, string defaultRefName = null)
{
if (step is JobExtensionRunner extensionRunner && extensionRunner.RepositoryRef != null)
{
return JsonConvert.SerializeObject(extensionRunner.RepositoryRef);
}
if (step is IActionRunner actionRunner && actionRunner.Action?.Reference != null)
{
return JsonConvert.SerializeObject(actionRunner.Action.Reference);
}
return defaultRefName;
}
}
}

21
src/Runner.Worker/JobExtension.cs
View File

@@ -213,9 +213,10 @@ namespace GitHub.Runner.Worker
containers.AddRange(jobContext.ServiceContainers);
preJobSteps.Add(new JobExtensionRunner(runAsync: containerProvider.StartContainersAsync,
condition: $"{PipelineTemplateConstants.Success}()",
displayName: "Initialize containers",
data: (object)containers));
condition: $"{PipelineTemplateConstants.Success}()",
displayName: "Initialize containers",
data: (object)containers,
repositoryRef: null));
}
// Add action steps
@@ -260,18 +261,19 @@ namespace GitHub.Runner.Worker
// Create execution context for pre-job steps
foreach (var step in preJobSteps)
{
if (step is JobExtensionRunner)
if (step is JobExtensionRunner extensionStep)
{
JobExtensionRunner extensionStep = step as JobExtensionRunner;
ArgUtil.NotNull(extensionStep, extensionStep.DisplayName);
ArgUtil.NotNull(extensionStep, step.DisplayName);
Guid stepId = Guid.NewGuid();
extensionStep.ExecutionContext = jobContext.CreateChild(stepId, extensionStep.DisplayName, null, null, stepId.ToString("N"));
var refName = step.GetRefName(defaultRefName: null);
extensionStep.ExecutionContext = jobContext.CreateChild(stepId, extensionStep.DisplayName, refName, null, stepId.ToString("N"));
}
else if (step is IActionRunner actionStep)
{
ArgUtil.NotNull(actionStep, step.DisplayName);
Guid stepId = Guid.NewGuid();
actionStep.ExecutionContext = jobContext.CreateChild(stepId, actionStep.DisplayName, actionStep.Action.Reference.ToString(), null, null, intraActionStates[actionStep.Action.Id]);
var refName = step.GetRefName(defaultRefName: stepId.ToString("N"));
actionStep.ExecutionContext = jobContext.CreateChild(stepId, actionStep.DisplayName, refName, null, null, intraActionStates[actionStep.Action.Id]);
}
}
@@ -282,7 +284,8 @@ namespace GitHub.Runner.Worker
{
ArgUtil.NotNull(actionStep, step.DisplayName);
intraActionStates.TryGetValue(actionStep.Action.Id, out var intraActionState);
actionStep.ExecutionContext = jobContext.CreateChild(actionStep.Action.Id, actionStep.DisplayName, actionStep.Action.Reference.ToString(), actionStep.Action.ScopeName, actionStep.Action.ContextName, intraActionState);
var refName = step.GetRefName(defaultRefName: actionStep.Action.Name);
actionStep.ExecutionContext = jobContext.CreateChild(actionStep.Action.Id, actionStep.DisplayName, refName, actionStep.Action.ScopeName, actionStep.Action.ContextName, intraActionState);
}
}

8
src/Runner.Worker/JobExtensionRunner.cs
View File

@@ -1,7 +1,7 @@
using System;
using System.Threading.Tasks;
using GitHub.DistributedTask.Expressions2;
using GitHub.DistributedTask.ObjectTemplating.Tokens;
using GitHub.DistributedTask.Pipelines;
namespace GitHub.Runner.Worker
{
@@ -9,22 +9,26 @@ namespace GitHub.Runner.Worker
{
private readonly object _data;
private readonly Func<IExecutionContext, object, Task> _runAsync;
private readonly RepositoryPathReference _repositoryRef;
public JobExtensionRunner(
Func<IExecutionContext, object, Task> runAsync,
string condition,
string displayName,
object data)
object data,
RepositoryPathReference repositoryRef)
{
_runAsync = runAsync;
Condition = condition;
DisplayName = displayName;
_data = data;
_repositoryRef = repositoryRef;
}
public string Condition { get; set; }
public TemplateToken ContinueOnError => new BooleanToken(null, null, null, false);
public string DisplayName { get; set; }
public RepositoryPathReference RepositoryRef => _repositoryRef;
public IExecutionContext ExecutionContext { get; set; }
public TemplateToken Timeout => new NumberToken(null, null, null, 0);
public object Data => _data;

5
src/Sdk/DTPipelines/Pipelines/ActionStepDefinitionReference.cs
View File

@@ -128,11 +128,6 @@ namespace GitHub.DistributedTask.Pipelines
{
return new RepositoryPathReference(this);
}
public override string ToString()
{
return $"ActionRef,RepositoryPath: {Name}@{Ref}";
}
}
[EditorBrowsable(EditorBrowsableState.Never)]

2
src/Test/L0/Worker/JobExtensionL0.cs
View File

@@ -176,7 +176,7 @@ namespace GitHub.Runner.Common.Tests.Worker
jobExtension.Initialize(hc);
_actionManager.Setup(x => x.PrepareActionsAsync(It.IsAny<IExecutionContext>(), It.IsAny<IEnumerable<Pipelines.JobStep>>()))
.Returns(Task.FromResult(new PrepareResult(new List<JobExtensionRunner>() { new JobExtensionRunner(null, "", "prepare1", null), new JobExtensionRunner(null, "", "prepare2", null) }, new Dictionary<Guid, IActionRunner>())));
.Returns(Task.FromResult(new PrepareResult(new List<JobExtensionRunner>() { new JobExtensionRunner(null, "", "prepare1", null, null), new JobExtensionRunner(null, "", "prepare2", null, null) }, new Dictionary<Guid, IActionRunner>())));
List<IStep> result = await jobExtension.InitializeJob(_jobEc, _message);