From 532fb8002c441d38ae7943e4366fe2c1dfa0c862 Mon Sep 17 00:00:00 2001 From: technofab Date: Sun, 13 Oct 2024 18:32:47 +0200 Subject: [PATCH] fix(module): append "finalize_nix_ci" to after_script, not prepend --- lib/flakeModule.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/flakeModule.nix b/lib/flakeModule.nix index e518964..891b825 100644 --- a/lib/flakeModule.nix +++ b/lib/flakeModule.nix @@ -155,10 +155,15 @@ // lib.optionalAttrs job.nix.enable { ${key} = 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"; - prependToAfterScript = prepend "after_script"; + appendToAfterScript = append "after_script"; jobs = filterAttrsRec (n: v: v != null) config.ci.jobs; rest = filterAttrsRec (n: v: v != null) (builtins.removeAttrs config.ci ["jobs" "config"]); @@ -203,7 +208,7 @@ (prependToBeforeScript [ "source setup_nix_ci ${key}" ] - (prependToAfterScript [ + (appendToAfterScript [ "finalize_nix_ci" ] job))