qbit/xin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ci/xinlib: kill ssh-agent to work around systemd bug / OneShot 'cron'

Browse Source
This commit is contained in:
Aaron Bieber 2023-06-16 10:24:22 -06:00
parent 8e55cbc5a6
commit 143a347c53
No known key found for this signature in database
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common.sh
View File

@ -117,6 +117,7 @@ finish() {
finish_ci() { finish_ci() {
ssh-add -d /run/secrets/ci_ed25519_key ssh-add -d /run/secrets/ci_ed25519_key
ssh-add -d /run/secrets/ci_signing_ed25519_key ssh-add -d /run/secrets/ci_signing_ed25519_key
pkill ssh-agent # TODO: https://github.com/systemd/systemd/pull/28035
exit 0 exit 0
} }

8
lib/default.nix
View File

@ -41,6 +41,9 @@ let
value = { value = {
script = mkCronScript "${job.name}_script" job.script; script = mkCronScript "${job.name}_script" job.script;
inherit (job) startAt path; inherit (job) startAt path;
serviceConfig = {
OneShot = true;
};
}; };
}; };
jobToService = job: { jobToService = job: {
@ -48,7 +51,10 @@ let
value = { value = {
script = mkCronScript "${job.name}_script" job.script; script = mkCronScript "${job.name}_script" job.script;
inherit (job) startAt path; inherit (job) startAt path;
serviceConfig = { User = "${job.user}"; }; serviceConfig = {
User = "${job.user}";
OneShot = true;
};
}; };
}; };
buildShell = pkgs: buildShell = pkgs: