From c8f51c73eda5f0d2bcdd7c8f80769c67de94534d Mon Sep 17 00:00:00 2001 From: Skryta Istota <6970043-hidden-being@users.noreply.gitlab.com> Date: Wed, 3 Dec 2025 17:35:36 +0100 Subject: [PATCH] fix(job) Fixed premature filtering of variables Fixed excessive deletion of environment variables containing paths to nix store package files, causing them to not be exported in Giltab's CI environment, plus removed duplicate tests for moving environment variables. --- lib/impl/modules/job.nix | 2 +- tests/modules_test.nix | 23 ----------------------- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/lib/impl/modules/job.nix b/lib/impl/modules/job.nix index 295093d..1f99d5b 100644 --- a/lib/impl/modules/job.nix +++ b/lib/impl/modules/job.nix @@ -646,7 +646,7 @@ in rec { }; depsDrv = cilib.mkJobDeps { key = name; - job = config.finalConfig; + inherit job; nixConfig = config.nix; }; runnerDrv = cilib.mkJobRun { diff --git a/tests/modules_test.nix b/tests/modules_test.nix index e56ad34..0bd19c6 100644 --- a/tests/modules_test.nix +++ b/tests/modules_test.nix @@ -91,29 +91,6 @@ assert_file_contains ${package} 'HELLO="/nix/store/.*-hello-.*"' ''; } - { - name = "do not fail on store paths"; - type = "script"; - script = let - package = - (cilib.mkCI { - pipelines."test" = { - variables = { - HELLO = "${pkgs.hello}"; - SAMPLE = "empty"; - }; - }; - }).packages."gitlab-ci:pipeline:test"; - in - # sh - '' - ${ntlib.helpers.path [pkgs.gnugrep]} - ${ntlib.helpers.scriptHelpers} - assert_file_contains ${package} '[".pre",".post"]' - assert_file_contains ${package} '"HELLO":"/nix/store/.*-hello-.*"' - assert_file_contains ${package} '"SAMPLE":"empty"' - ''; - } ]; }; }