actions/runner
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Avoid throw in SelfUpdaters. (#4274)

Browse Source
This commit is contained in:
Tingluo Huang
2026-03-02 22:44:14 -05:00
committed by GitHub
parent 60a9422599
commit a9a07a6553
4 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Runner.Listener/SelfUpdater.cs
+3 -1
View File
@@ -120,8 +120,10 @@ namespace GitHub.Runner.Listener
} }
catch (Exception ex) catch (Exception ex)
{ {
Trace.Error(ex);
_terminal.WriteError($"Runner update failed: {ex.Message}");
_updateTrace.Enqueue(ex.ToString()); _updateTrace.Enqueue(ex.ToString());
throw; return false;
} }
finally finally
{ {
src/Runner.Listener/SelfUpdaterV2.cs
+3 -1
View File
@@ -120,8 +120,10 @@ namespace GitHub.Runner.Listener
} }
catch (Exception ex) catch (Exception ex)
{ {
Trace.Error(ex);
_terminal.WriteError($"Runner update failed: {ex.Message}");
_updateTrace.Enqueue(ex.ToString()); _updateTrace.Enqueue(ex.ToString());
throw; return false;
} }
finally finally
{ {
src/Test/L0/Listener/SelfUpdaterL0.cs
+4 -4
View File
@@ -228,8 +228,8 @@ namespace GitHub.Runner.Common.Tests.Listener
.Returns(Task.FromResult(new TaskAgent())); .Returns(Task.FromResult(new TaskAgent()));
var ex = await Assert.ThrowsAsync<TaskCanceledException>(() => updater.SelfUpdate(_refreshMessage, _jobDispatcher.Object, true, hc.RunnerShutdownToken)); var result = await updater.SelfUpdate(_refreshMessage, _jobDispatcher.Object, true, hc.RunnerShutdownToken);
Assert.Contains($"failed after {Constants.RunnerDownloadRetryMaxAttempts} download attempts", ex.Message); Assert.False(result);
} }
} }
finally finally
@@ -281,8 +281,8 @@ namespace GitHub.Runner.Common.Tests.Listener
.Returns(Task.FromResult(new TaskAgent())); .Returns(Task.FromResult(new TaskAgent()));
var ex = await Assert.ThrowsAsync<Exception>(() => updater.SelfUpdate(_refreshMessage, _jobDispatcher.Object, true, hc.RunnerShutdownToken)); var result = await updater.SelfUpdate(_refreshMessage, _jobDispatcher.Object, true, hc.RunnerShutdownToken);
Assert.Contains("did not match expected Runner Hash", ex.Message); Assert.False(result);
} }
} }
finally finally
src/Test/L0/Listener/SelfUpdaterV2L0.cs
+4 -4
View File
@@ -170,8 +170,8 @@ namespace GitHub.Runner.Common.Tests.Listener
DownloadUrl = "https://github.com/actions/runner/notexists" DownloadUrl = "https://github.com/actions/runner/notexists"
}; };
var ex = await Assert.ThrowsAsync<TaskCanceledException>(() => updater.SelfUpdate(message, _jobDispatcher.Object, true, hc.RunnerShutdownToken)); var result = await updater.SelfUpdate(message, _jobDispatcher.Object, true, hc.RunnerShutdownToken);
Assert.Contains($"failed after {Constants.RunnerDownloadRetryMaxAttempts} download attempts", ex.Message); Assert.False(result);
} }
} }
finally finally
@@ -220,8 +220,8 @@ namespace GitHub.Runner.Common.Tests.Listener
SHA256Checksum = "badhash" SHA256Checksum = "badhash"
}; };
var ex = await Assert.ThrowsAsync<Exception>(() => updater.SelfUpdate(message, _jobDispatcher.Object, true, hc.RunnerShutdownToken)); var result = await updater.SelfUpdate(message, _jobDispatcher.Object, true, hc.RunnerShutdownToken);
Assert.Contains("did not match expected Runner Hash", ex.Message); Assert.False(result);
} }
} }
finally finally