technofab/nix-gitlab-ci
1
0
Fork 0
mirror of https://gitlab.com/TECHNOFAB/nix-gitlab-ci.git synced 2025-12-12 10:10:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(module): append "finalize_nix_ci" to after_script, not prepend

Browse source
This commit is contained in:
technofab 2024-10-13 18:32:47 +02:00
parent 81b497d976
commit 532fb8002c
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/flakeModule.nix
View file

@ -155,10 +155,15 @@
// lib.optionalAttrs job.nix.enable { // lib.optionalAttrs job.nix.enable {
${key} = ${key} =
arr arr
++ job.${key} or []; ++ (job.${key} or []);
};
append = key: arr: job:
job
// lib.optionalAttrs job.nix.enable {
${key} = (job.${key} or []) ++ arr;
}; };
prependToBeforeScript = prepend "before_script"; prependToBeforeScript = prepend "before_script";
prependToAfterScript = prepend "after_script"; appendToAfterScript = append "after_script";
jobs = filterAttrsRec (n: v: v != null) config.ci.jobs; jobs = filterAttrsRec (n: v: v != null) config.ci.jobs;
rest = filterAttrsRec (n: v: v != null) (builtins.removeAttrs config.ci ["jobs" "config"]); rest = filterAttrsRec (n: v: v != null) (builtins.removeAttrs config.ci ["jobs" "config"]);
@ -203,7 +208,7 @@
(prependToBeforeScript [ (prependToBeforeScript [
"source setup_nix_ci ${key}" "source setup_nix_ci ${key}"
] ]
(prependToAfterScript [ (appendToAfterScript [
"finalize_nix_ci" "finalize_nix_ci"
] ]
job)) job))