Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/Runner.Worker/JobExtension.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -191,6 +191,13 @@ public async Task<List<IStep>> InitializeJob(IExecutionContext jobContext, Pipel
context.Output($"Runner is running behind proxy server '{HostContext.WebProxy.HttpsProxyAddress}' for all HTTPS requests.");
}

// Signal to the user that the job is running with locked/pinned
// action dependencies (a lockfile is in effect).
if (message.ActionsDependencies != null && message.ActionsDependencies.Count > 0)
{
context.Output("Running with locked dependencies");
Comment thread
nodeselector marked this conversation as resolved.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
context.Output("Running with locked dependencies");
context.Output("Using pinned Action versions");

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This reads a little clearer to me but its mostly a nit comment

}

// Prepare the workflow directory
context.Output("Prepare workflow directory");
var directoryManager = HostContext.GetService<IPipelineDirectoryManager>();
Expand Down
67 changes: 61 additions & 6 deletions src/Test/L0/Worker/JobExtensionL0.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -199,6 +199,54 @@ public async Task JobExtensionBuildStepsList()
}
}

[Fact]
[Trait("Level", "L0")]
[Trait("Category", "Worker")]
public async Task JobExtensionOutputsLockedDependenciesWhenPresent()
{
using (TestHostContext hc = CreateTestContext())
{
var consoleLines = new List<string>();
_jobServerQueue.Setup(x => x.QueueWebConsoleLine(It.IsAny<Guid>(), It.IsAny<string>(), It.IsAny<long?>()))
.Callback((Guid _, string line, long? __) => consoleLines.Add(line));

_message.ActionsDependencies.Add("actions/checkout@v4:sha256-abc123");

var jobExtension = new JobExtension();
jobExtension.Initialize(hc);

_actionManager.Setup(x => x.PrepareActionsAsync(It.IsAny<IExecutionContext>(), It.IsAny<IEnumerable<Pipelines.JobStep>>(), It.IsAny<Guid>()))
.Returns(Task.FromResult(new PrepareResult(new List<JobExtensionRunner>(), new Dictionary<Guid, IActionRunner>())));

await jobExtension.InitializeJob(_jobEc, _message);

Assert.Contains(consoleLines, line => line.Contains("Running with locked dependencies"));
}
}

[Fact]
[Trait("Level", "L0")]
[Trait("Category", "Worker")]
public async Task JobExtensionDoesNotOutputLockedDependenciesWhenAbsent()
{
using (TestHostContext hc = CreateTestContext())
{
var consoleLines = new List<string>();
_jobServerQueue.Setup(x => x.QueueWebConsoleLine(It.IsAny<Guid>(), It.IsAny<string>(), It.IsAny<long?>()))
.Callback((Guid _, string line, long? __) => consoleLines.Add(line));

var jobExtension = new JobExtension();
jobExtension.Initialize(hc);

_actionManager.Setup(x => x.PrepareActionsAsync(It.IsAny<IExecutionContext>(), It.IsAny<IEnumerable<Pipelines.JobStep>>(), It.IsAny<Guid>()))
.Returns(Task.FromResult(new PrepareResult(new List<JobExtensionRunner>(), new Dictionary<Guid, IActionRunner>())));

await jobExtension.InitializeJob(_jobEc, _message);

Assert.DoesNotContain(consoleLines, line => line.Contains("Running with locked dependencies"));
}
}

[Fact]
[Trait("Level", "L0")]
[Trait("Category", "Worker")]
Expand DownExpand Up@@ -292,15 +340,22 @@ public async Task InitializeJob_DoesNotLogCacheMode_WhenVariableAbsent()
public async Task JobExtensionBuildFailsWithoutContainerIfRequired()
{
Environment.SetEnvironmentVariable(Constants.Variables.Actions.RequireJobContainer, "true");
using (TestHostContext hc = CreateTestContext())
try
{
var jobExtension = new JobExtension();
jobExtension.Initialize(hc);
using (TestHostContext hc = CreateTestContext())
{
var jobExtension = new JobExtension();
jobExtension.Initialize(hc);

_actionManager.Setup(x => x.PrepareActionsAsync(It.IsAny<IExecutionContext>(), It.IsAny<IEnumerable<Pipelines.JobStep>>(), It.IsAny<Guid>()))
.Returns(Task.FromResult(new PrepareResult(new List<JobExtensionRunner>() { new JobExtensionRunner(null, "", "prepare1", null), new JobExtensionRunner(null, "", "prepare2", null) }, new Dictionary<Guid, IActionRunner>())));
_actionManager.Setup(x => x.PrepareActionsAsync(It.IsAny<IExecutionContext>(), It.IsAny<IEnumerable<Pipelines.JobStep>>(), It.IsAny<Guid>()))
.Returns(Task.FromResult(new PrepareResult(new List<JobExtensionRunner>() { new JobExtensionRunner(null, "", "prepare1", null), new JobExtensionRunner(null, "", "prepare2", null) }, new Dictionary<Guid, IActionRunner>())));

await Assert.ThrowsAsync<ArgumentException>(() => jobExtension.InitializeJob(_jobEc, _message));
await Assert.ThrowsAsync<ArgumentException>(() => jobExtension.InitializeJob(_jobEc, _message));
}
}
finally
{
Environment.SetEnvironmentVariable(Constants.Variables.Actions.RequireJobContainer, null);
}
}

Expand Down
Loading