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

rollback(jobPatched) Restored some features for patching jobs for ci

Browse source 
Tests for this filtering of environment variables in ci have also been rollback.
This commit is contained in:
Skryta Istota 2025-12-03 16:35:45 +01:00
parent fb234b80bf
commit 0ef6f4d2ff
No known key found for this signature in database
3 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/impl/jobPatched.nix
View file

@ -3,7 +3,7 @@
helpers, helpers,
}: let }: let
inherit (lib) toList optionalAttrs optional; inherit (lib) toList optionalAttrs optional;
inherit (helpers) prependToBeforeScript appendToAfterScript; inherit (helpers) prependToBeforeScript appendToAfterScript filterJobVariables;
in in
{ {
key, key,
@ -19,7 +19,7 @@ in
// (appendToAfterScript ["finalize_nix_ci"] job) // (appendToAfterScript ["finalize_nix_ci"] job)
// (let // (let
variables = variables =
job.variables or {} (filterJobVariables false job)
// optionalAttrs nixConfig.enableRunnerCache { // optionalAttrs nixConfig.enableRunnerCache {
NIX_CI_CACHE_STRATEGY = "runner"; NIX_CI_CACHE_STRATEGY = "runner";
}; };

1
nix/repo/ci.nix
View file

@ -73,7 +73,6 @@ in
variables = { variables = {
SAMPLE = "working"; SAMPLE = "working";
HELLO = toString pkgs.hello; HELLO = toString pkgs.hello;
FF_SCRIPT_SECTIONS = "true";
}; };
}; };
"test" = { "test" = {

6
tests/cilib_test.nix
View file

@ -88,7 +88,7 @@
after_script = ["finalize_nix_ci"]; after_script = ["finalize_nix_ci"];
before_script = ["source setup_nix_ci \"gitlab-ci:pipeline:test:job-deps:test\""]; before_script = ["source setup_nix_ci \"gitlab-ci:pipeline:test:job-deps:test\""];
variables = { variables = {
BASH = toString pkgs.bash; #BASH = toString pkgs.bash;
TEST = "work"; TEST = "work";
}; };
cache = [ cache = [
@ -134,7 +134,7 @@
]; ];
variables = { variables = {
NIX_CI_CACHE_STRATEGY = "runner"; NIX_CI_CACHE_STRATEGY = "runner";
BASH = toString pkgs.bash; #BASH = toString pkgs.bash;
TEST = "work"; TEST = "work";
}; };
}; };
@ -273,7 +273,7 @@
]; ];
variables = { variables = {
SAMPLE = "working"; SAMPLE = "working";
HELLO = toString pkgs.hello; #HELLO = toString pkgs.hello;
NIX_CI_CACHE_STRATEGY = "runner"; NIX_CI_CACHE_STRATEGY = "runner";
}; };
}; };