github-runner: fix authentication with actions/checkout@v6 (#1655)

This commit is contained in:
Michael Hoang 2025-12-14 03:47:29 +00:00 committed by GitHub
commit 9b628e171b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -2,13 +2,13 @@
let let
inherit (lib) any attrValues boolToString concatStringsSep escapeShellArg inherit (lib) any attrValues boolToString concatStringsSep escapeShellArg
flatten flip getExe getExe' hasAttr hasPrefix mapAttrsToList mapAttrs' mkBefore flatten flip getExe getExe' hasPrefix mapAttrsToList mapAttrs' mkBefore
mkDefault mkIf mkMerge nameValuePair optionalAttrs optionalString replaceStrings; mkDefault mkIf mkMerge nameValuePair optionalString replaceStrings;
mkSvcName = name: "github-runner-${name}"; mkSvcName = name: "github-runner-${name}";
mkStateDir = cfg: "/var/lib/github-runners/${cfg.name}"; mkStateDir = cfg: "/var/lib/github-runners/${cfg.name}";
mkLogDir = cfg: "/var/log/github-runners/${cfg.name}"; mkLogDir = cfg: "/var/log/github-runners/${cfg.name}";
mkWorkDir = cfg: if (cfg.workDir != null) then cfg.workDir else "/var/lib/github-runners/_work/${cfg.name}"; mkWorkDir = cfg: if (cfg.workDir != null) then cfg.workDir else "/private/var/lib/github-runners/_work/${cfg.name}";
in in
{ {
config.assertions = flatten ( config.assertions = flatten (
@ -54,7 +54,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}'..."
# shellcheck disable=SC2174 # shellcheck disable=SC2174
@ -70,7 +70,7 @@ in
${getExe' pkgs.coreutils "mkdir"} -p -m u=rwx,g=rx,o= ${escapeShellArg (mkWorkDir cfg)} ${getExe' pkgs.coreutils "mkdir"} -p -m u=rwx,g=rx,o= ${escapeShellArg (mkWorkDir cfg)}
${getExe' pkgs.coreutils "chown"} ${user}:${group} ${escapeShellArg (mkWorkDir cfg)} ${getExe' pkgs.coreutils "chown"} ${user}:${group} ${escapeShellArg (mkWorkDir cfg)}
''} ''}
''); '';
}; };
})); }));