mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-03-06 23:31:34 +00:00
Code Issues Wiki Activity

github-runner: prevent self-updates

Browse source 
As of yet, a patch caused the runner to discard update messages.
Unfortunately, GitHub keeps sending update messages to outdated runners
causing them to no longer pick up jobs.

This commit causes the runner to send a high version to GitHub which
should be more recent for quite a time. That way, GitHub does not send
update message and keeps scheduling jobs even for outdated runners.

Naturally, an oudated runner can still break at any time as GitHub's
current approach assumes that all runners are always up-to-date. We
should still strive for quick nixpkgs updates but this patch should give
us some time.
This commit is contained in:
Vincent Haupert 2021-09-13 18:32:38 +02:00
parent cc5c902fdf
commit e8bbcc79fd
No known key found for this signature in database
GPG key ID: A8B605E96F82B4E4
3 changed files with 28 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/tools/continuous-integration/github-runner/default.nix
View file

@ -68,8 +68,9 @@ stdenv.mkDerivation rec {
./patches/use-get-directory-for-diag.patch
# Don't try to install systemd service
./patches/dont-install-systemd-service.patch
# Don't try to self-update runner (cannot be disabled, see https://github.com/actions/runner/issues/485)
./patches/ignore-self-update.patch
# Prevent the runner from starting a self-update for new versions
# (upstream issue: https://github.com/actions/runner/issues/485)
./patches/prevent-self-update.patch
];
postPatch = ''

24
pkgs/development/tools/continuous-integration/github-runner/patches/ignore-self-update.patch
View file

@ -1,24 +0,0 @@
diff --git a/src/Runner.Listener/Runner.cs b/src/Runner.Listener/Runner.cs
index 68b0b4e..5da21fe 100644
--- a/src/Runner.Listener/Runner.cs
+++ b/src/Runner.Listener/Runner.cs
@@ -391,18 +391,7 @@ namespace GitHub.Runner.Listener
HostContext.WritePerfCounter($"MessageReceived_{message.MessageType}");
if (string.Equals(message.MessageType, AgentRefreshMessage.MessageType, StringComparison.OrdinalIgnoreCase))
{
- if (autoUpdateInProgress == false)
- {
- autoUpdateInProgress = true;
- var runnerUpdateMessage = JsonUtility.FromString<AgentRefreshMessage>(message.Body);
- var selfUpdater = HostContext.GetService<ISelfUpdater>();
- selfUpdateTask = selfUpdater.SelfUpdate(runnerUpdateMessage, jobDispatcher, !runOnce && HostContext.StartupType != StartupType.Service, HostContext.RunnerShutdownToken);
- Trace.Info("Refresh message received, kick-off selfupdate background process.");
- }
- else
- {
- Trace.Info("Refresh message received, skip autoupdate since a previous autoupdate is already running.");
- }
+ Trace.Info("Ignoring received refresh message (would trigger self-update).");
}
else if (string.Equals(message.MessageType, JobRequestMessageTypes.PipelineAgentJobRequest, StringComparison.OrdinalIgnoreCase))
{

25
pkgs/development/tools/continuous-integration/github-runner/patches/prevent-self-update.patch Normal file
View file

@ -0,0 +1,25 @@
From 8b77c9c61058842e031dd176df2b9c79bc2c0e28 Mon Sep 17 00:00:00 2001
From: Vincent Haupert <mail@vincent-haupert.de>
Date: Sun, 12 Sep 2021 19:52:21 +0200
Subject: [PATCH] Use a fake version to prevent self-update
---
src/Runner.Listener/MessageListener.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Runner.Listener/MessageListener.cs b/src/Runner.Listener/MessageListener.cs
index 71e5e43..29945e0 100644
--- a/src/Runner.Listener/MessageListener.cs
+++ b/src/Runner.Listener/MessageListener.cs
@@ -65,7 +65,7 @@ namespace GitHub.Runner.Listener
{
Id = _settings.AgentId,
Name = _settings.AgentName,
- Version = BuildConstants.RunnerPackage.Version,
+ Version = "2.999.9",
OSDescription = RuntimeInformation.OSDescription,
};
string sessionName = $"{Environment.MachineName ?? "RUNNER"}";
--
2.32.0