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

fix(jobPatched): fix variables not being unset if all contain store paths

Browse source 
the goal was to remove "variables" when it's empty, but this resulted in
the original value being used if all of the variables contained store
paths. This is not supposed to happen and thus fixed with this.
This commit is contained in:
technofab 2025-09-03 15:17:51 +02:00
parent a076f0048a
commit 31f0e4ea13
No known key found for this signature in database
2 changed files with 31 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lib/impl/helpers.nix
View file

@ -2,7 +2,21 @@
pkgs, pkgs,
lib, lib,
} @ args: let } @ args: let
inherit (lib) types isAttrs filterAttrs mapAttrs mkOption mkOptionType isType literalExpression pipe; inherit
(lib)
types
isAttrs
filterAttrs
mapAttrs
mkOption
mkOptionType
isType
literalExpression
pipe
hasInfix
concatMapAttrs
optionalAttrs
;
in rec { in rec {
prepend = key: arr: job: { prepend = key: arr: job: {
${key} = arr ++ (job.${key} or []); ${key} = arr ++ (job.${key} or []);
@ -33,10 +47,10 @@ in rec {
# filter job's variables to either only those containing store paths # filter job's variables to either only those containing store paths
# or those that do not # or those that do not
filterJobVariables = nix: job: filterJobVariables = shouldContain: job:
lib.concatMapAttrs ( concatMapAttrs (
name: value: name: value:
lib.optionalAttrs ((lib.hasInfix "/nix/store/" value) == nix) { optionalAttrs ((hasInfix "/nix/store/" value) == shouldContain) {
${name} = value; ${name} = value;
} }
) )

38
lib/impl/jobPatched.nix
View file

@ -16,28 +16,16 @@ in
(prependToBeforeScript ["source setup_nix_ci \"gitlab-ci:pipeline:${pipelineName}:job-deps:${key}\""] job) (prependToBeforeScript ["source setup_nix_ci \"gitlab-ci:pipeline:${pipelineName}:job-deps:${key}\""] job)
// (appendToAfterScript ["finalize_nix_ci"] job) // (appendToAfterScript ["finalize_nix_ci"] job)
)) ))
// optionalAttrs nixConfig.enable ( // optionalAttrs nixConfig.enable {
(let variables =
variables = (filterJobVariables false job)
(filterJobVariables false job) // optionalAttrs nixConfig.enableRunnerCache {
// optionalAttrs nixConfig.enableRunnerCache { NIX_CI_CACHE_STRATEGY = "runner";
NIX_CI_CACHE_STRATEGY = "runner"; };
}; cache =
in (toList (job.cache or []))
# filter empty variables ++ (optional nixConfig.enableRunnerCache {
optionalAttrs (variables != {}) { key = nixConfig.runnerCacheKey;
inherit variables; paths = [".nix-cache/"];
}) });
// (let }
cache =
(toList (job.cache or []))
++ (optional nixConfig.enableRunnerCache {
key = nixConfig.runnerCacheKey;
paths = [".nix-cache/"];
});
in
# filter empty cache
optionalAttrs (cache != []) {
inherit cache;
})
)