github/actions-runner
1
0
Fork 0
mirror of https://github.com/actions/runner.git synced 2026-07-03 11:06:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

feedback

Browse Source
This commit is contained in:
Francesco Renzi
2026-05-06 07:48:47 -07:00
committed by GitHub
parent da5bc7d859
commit 89b6b32e3e
4 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Runner.Worker/Dap/DapDebugger.cs
View File

@@ -251,12 +251,10 @@ namespace GitHub.Runner.Worker.Dap
{
if (_jobContext != null)
{
var cancellationToken = _jobContext.CancellationToken;
Trace.Info("Job completed — pausing for inspection");
SendStoppedEvent("completed", "Job completed — inspect variables before the session ends.");
await WaitForCommandAsync(cancellationToken);
await WaitForCommandAsync(_jobContext.CancellationToken);
}
}
catch (Exception ex)
@@ -274,8 +272,6 @@ namespace GitHub.Runner.Worker.Dap
Trace.Warning($"DAP OnJobCompleted error: {ex.Message}");
}
}
await StopAsync();
}
public async Task StopAsync()

1
src/Runner.Worker/Dap/IDapDebugger.cs
View File

@@ -22,5 +22,6 @@ namespace GitHub.Runner.Worker.Dap
Task OnStepStartingAsync(IStep step);
void OnStepCompleted(IStep step);
Task OnJobCompletedAsync();
Task StopAsync();
}
}

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

@@ -69,6 +69,7 @@ namespace GitHub.Runner.Worker
List<IStep> preJobSteps = new();
List<IStep> jobSteps = new();
var initSucceeded = false;
using (var register = jobContext.CancellationToken.Register(() => { context.CancelToken(); }))
{
try
@@ -494,20 +495,9 @@ namespace GitHub.Runner.Worker
{
_dapDebugger = HostContext.GetService<IDapDebugger>();
await _dapDebugger.StartAsync(jobContext);
}
catch (Exception ex)
{
Trace.Error($"Failed to start DAP debugger: {ex.Message}");
AddDebuggerConnectionTelemetry(jobContext, $"Failed: {ex.GetType().Name}");
context.Error("Failed to start debugger.");
context.Result = TaskResult.Failed;
throw;
}
context.Output("Waiting for debugger client to connect…");
context.Output("Waiting for debugger client to connect…");
try
{
await _dapDebugger.WaitUntilReadyAsync();
context.Output("Debugger connected.");
AddDebuggerConnectionTelemetry(jobContext, "Connected");
@@ -517,19 +507,18 @@ namespace GitHub.Runner.Worker
Trace.Info("Job was cancelled before debugger client connected.");
AddDebuggerConnectionTelemetry(jobContext, "Canceled");
context.Error("Job was cancelled before debugger client connected.");
context.Result = TaskResult.Canceled;
throw;
}
catch (Exception ex)
{
Trace.Error($"DAP debugger failed to become ready: {ex.Message}");
Trace.Error($"DAP debugger failed: {ex.Message}");
AddDebuggerConnectionTelemetry(jobContext, $"Failed: {ex.GetType().Name}");
context.Error("The debugger failed to start or no debugger client connected in time.");
context.Result = TaskResult.Failed;
throw;
}
}
initSucceeded = true;
return steps;
}
catch (OperationCanceledException ex) when (jobContext.CancellationToken.IsCancellationRequested)
@@ -551,12 +540,12 @@ namespace GitHub.Runner.Worker
finally
{
// If InitializeJob failed after the debugger was started,
// clean it up here since FinalizeJob won't run.
if (context.Result != null && _dapDebugger != null)
// tear down the transport here since FinalizeJob won't run.
if (!initSucceeded && _dapDebugger != null)
{
try
{
await _dapDebugger.OnJobCompletedAsync();
await _dapDebugger.StopAsync();
}
catch (Exception ex)
{
@@ -867,7 +856,18 @@ namespace GitHub.Runner.Worker
}
catch (Exception ex)
{
Trace.Warning($"DAP debugger cleanup error: {ex.Message}");
Trace.Warning($"DAP debugger completion error: {ex.Message}");
}
finally
{
try
{
await _dapDebugger.StopAsync();
}
catch (Exception ex)
{
Trace.Warning($"DAP debugger stop error: {ex.Message}");
}
}
_dapDebugger = null;
}

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

@@ -911,6 +911,7 @@ namespace GitHub.Runner.Common.Tests.Worker
mockDebugger.Setup(x => x.StartAsync(It.IsAny<IExecutionContext>())).Returns(Task.CompletedTask);
mockDebugger.Setup(x => x.WaitUntilReadyAsync()).Returns(Task.CompletedTask);
mockDebugger.Setup(x => x.OnJobCompletedAsync()).ThrowsAsync(new InvalidOperationException("tunnel disposed"));
mockDebugger.Setup(x => x.StopAsync()).Returns(Task.CompletedTask);
hc.SetSingleton(mockDebugger.Object);
_actionManager.Setup(x => x.PrepareActionsAsync(It.IsAny<IExecutionContext>(), It.IsAny<IEnumerable<Pipelines.JobStep>>(), It.IsAny<Guid>()))
@@ -922,6 +923,7 @@ namespace GitHub.Runner.Common.Tests.Worker
await jobExtension.FinalizeJob(_jobEc, _message, DateTime.UtcNow);
mockDebugger.Verify(x => x.OnJobCompletedAsync(), Times.Once);
mockDebugger.Verify(x => x.StopAsync(), Times.Once);
}
}
}