mirrors/nix-darwin
mirrors/nix-darwin
1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2025-03-31 04:04:45 +00:00
Code Activity

Merge pull request #1013 from Enzime/fix/github-runners-work-dir

Browse source 
github-runnners: fix workDir missing on reboot
This commit is contained in:
Emily 2024-07-23 08:25:00 +01:00 • committed by GitHub
commit 884f3fe6d9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
modules/services/github-runner/service.nix
View file

@ -41,7 +41,7 @@ in
in in
{ {
launchd = mkIf cfg.enable { launchd = mkIf cfg.enable {
text = mkBefore ('' text = mkBefore ''
echo >&2 "setting up GitHub Runner '${cfg.name}'..." echo >&2 "setting up GitHub Runner '${cfg.name}'..."
${pkgs.coreutils}/bin/mkdir -p -m 0750 ${escapeShellArg (mkStateDir cfg)} ${pkgs.coreutils}/bin/mkdir -p -m 0750 ${escapeShellArg (mkStateDir cfg)}
@ -49,10 +49,7 @@ in
${pkgs.coreutils}/bin/mkdir -p -m 0750 ${escapeShellArg (mkLogDir cfg)} ${pkgs.coreutils}/bin/mkdir -p -m 0750 ${escapeShellArg (mkLogDir cfg)}
${pkgs.coreutils}/bin/chown ${user}:${group} ${escapeShellArg (mkLogDir cfg)} ${pkgs.coreutils}/bin/chown ${user}:${group} ${escapeShellArg (mkLogDir cfg)}
'' + optionalString (cfg.workDir == null) '' '';
${pkgs.coreutils}/bin/mkdir -p -m 0750 ${escapeShellArg (mkWorkDir cfg)}
${pkgs.coreutils}/bin/chown ${user}:${group} ${escapeShellArg (mkWorkDir cfg)}
'');
}; };
})); }));
@ -62,6 +59,9 @@ in
stateDir = mkStateDir cfg; stateDir = mkStateDir cfg;
logDir = mkLogDir cfg; logDir = mkLogDir cfg;
workDir = mkWorkDir cfg; workDir = mkWorkDir cfg;
user = if (cfg.user != null) then cfg.user else "_github-runner";
# If both user and group are null then we manage the group, otherwise if only group is null then there's no group
group = if (cfg.group != null) then group else if (cfg.user == null) then "_github-runner" else "";
in in
nameValuePair nameValuePair
(mkSvcName name) (mkSvcName name)
@ -116,6 +116,12 @@ in
'' ''
echo "Configuring GitHub Actions Runner" echo "Configuring GitHub Actions Runner"
${optionalString (cfg.workDir == null) ''
# /var/run gets cleared every reboot so we need to create it before starting the service
${pkgs.coreutils}/bin/mkdir -p -m 0750 ${escapeShellArg workDir}
${pkgs.coreutils}/bin/chown ${user}:${group} ${escapeShellArg workDir}
''}
# Always clean the working directory # Always clean the working directory
${pkgs.findutils}/bin/find ${escapeShellArg workDir} -mindepth 1 -delete ${pkgs.findutils}/bin/find ${escapeShellArg workDir} -mindepth 1 -delete
@ -147,7 +153,7 @@ in
StandardErrorPath = "${logDir}/launchd-stderr.log"; StandardErrorPath = "${logDir}/launchd-stderr.log";
StandardOutPath = "${logDir}/launchd-stdout.log"; StandardOutPath = "${logDir}/launchd-stdout.log";
ThrottleInterval = 30; ThrottleInterval = 30;
UserName = if (cfg.user != null) then cfg.user else "_github-runner"; UserName = user;
WatchPaths = [ WatchPaths = [
"/etc/resolv.conf" "/etc/resolv.conf"
"/Library/Preferences/SystemConfiguration/NetworkInterfaces.plist" "/Library/Preferences/SystemConfiguration/NetworkInterfaces.plist"