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

Merge branch 'fix-job-patch' into 'main'

Browse source 
fix: weird jobs patching

See merge request TECHNOFAB/nix-gitlab-ci!15
This commit is contained in:
Skryta Istota 2025-12-03 19:06:02 +01:00
commit 8a752f92cf
3 changed files with 45 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/impl/modules/job.nix
View file

@ -646,7 +646,7 @@ in rec {
}; };
depsDrv = cilib.mkJobDeps { depsDrv = cilib.mkJobDeps {
key = name; key = name;
job = config.finalConfig; inherit job;
nixConfig = config.nix; nixConfig = config.nix;
}; };
runnerDrv = cilib.mkJobRun { runnerDrv = cilib.mkJobRun {

21
nix/repo/ci.nix
View file

@ -1,5 +1,5 @@
{inputs, ...}: let {inputs, ...}: let
inherit (inputs) cilib; inherit (inputs) cilib pkgs;
in in
cilib.mkCI { cilib.mkCI {
config.soonix = { config.soonix = {
@ -58,9 +58,25 @@ in
}; };
}; };
pipelines."default" = { pipelines."default" = {
stages = ["test" "build" "deploy"]; stages = ["check" "test" "build" "deploy"];
variables = {
EXAMPLE = "empty";
CURL = toString pkgs.curl;
};
jobs = { jobs = {
"check" = {
stage = "check";
script = [
"set -euo pipefail"
"echo EXAMPLE=$EXAMPLE CURL=$CURL SAMPLE=$SAMPLE HELLO=$HELLO"
];
variables = {
SAMPLE = "working";
HELLO = toString pkgs.hello;
};
};
"test" = { "test" = {
nix.deps = with pkgs; [coreutils nix];
stage = "test"; stage = "test";
script = [ script = [
"nix run .#tests -- --junit=junit.xml" "nix run .#tests -- --junit=junit.xml"
@ -73,6 +89,7 @@ in
}; };
"docs" = { "docs" = {
stage = "build"; stage = "build";
nix.deps = with pkgs; [coreutils nix];
script = [ script = [
# sh # sh
'' ''

36
tests/modules_test.nix
View file

@ -10,9 +10,17 @@
simplePipeline = cilib.mkCI { simplePipeline = cilib.mkCI {
pipelines."test" = { pipelines."test" = {
stages = ["test"]; stages = ["test"];
variables = {
EXAMPLE = "empty";
CURL = toString pkgs.curl;
};
jobs."test" = { jobs."test" = {
stage = "test"; stage = "test";
script = ["echo hello world"]; script = ["echo hello world"];
variables = {
SAMPLE = "working";
HELLO = toString pkgs.hello;
};
}; };
}; };
}; };
@ -30,21 +38,29 @@
(cilib.mkCI {}).packages; (cilib.mkCI {}).packages;
} }
{ {
name = "simple pipeline"; name = "simple pipeline final config";
expected = { expected = {
stages = [".pre" "test" ".post"]; stages = [".pre" "test" ".post"];
variables = {
EXAMPLE = "empty";
CURL = toString pkgs.curl;
};
"test" = { "test" = {
image = "$NIX_CI_IMAGE"; image = "$NIX_CI_IMAGE";
stage = "test"; stage = "test";
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\""];
script = ["echo hello world"]; script = ["echo hello world"];
after_script = ["finalize_nix_ci"]; after_script = ["finalize_nix_ci"];
variables = {
SAMPLE = "working";
#HELLO = toString pkgs.hello;
};
}; };
}; };
actual = simplePipeline.pipelines."test".finalConfig; actual = simplePipeline.pipelines."test".finalConfig;
} }
{ {
name = "simple pipeline yaml"; name = "simple pipeline json";
type = "script"; type = "script";
script = let script = let
package = simplePipeline.packages."gitlab-ci:pipeline:test"; package = simplePipeline.packages."gitlab-ci:pipeline:test";
@ -56,25 +72,23 @@
assert_file_contains ${package} 'gitlab-ci:pipeline:test:job-deps:test' assert_file_contains ${package} 'gitlab-ci:pipeline:test:job-deps:test'
assert_file_contains ${package} 'finalize_nix_ci' assert_file_contains ${package} 'finalize_nix_ci'
assert_file_contains ${package} 'echo hello world' assert_file_contains ${package} 'echo hello world'
assert_file_contains ${package} '"EXAMPLE":"empty"'
assert_file_contains ${package} '"SAMPLE":"working"'
assert_file_contains ${package} '"CURL":"/nix/store/.*-curl-.*"'
''; '';
} }
{ {
name = "dont fail on store paths"; name = "simple pipeline deps drv";
type = "script"; type = "script";
script = let script = let
package = package = simplePipeline.packages."gitlab-ci:pipeline:test:job-deps:test";
(cilib.mkCI {
pipelines."test" = {
variables.EXAMPLE = "${pkgs.hello}";
};
}).packages."gitlab-ci:pipeline:test";
in in
# sh # sh
'' ''
${ntlib.helpers.path [pkgs.gnugrep]} ${ntlib.helpers.path [pkgs.gnugrep]}
${ntlib.helpers.scriptHelpers} ${ntlib.helpers.scriptHelpers}
assert_file_contains ${package} '[".pre",".post"]' assert_file_contains ${package} ':$PATH'
assert_file_contains ${package} '"EXAMPLE":"/nix/store/.*-hello-.*"' assert_file_contains ${package} 'HELLO="/nix/store/.*-hello-.*"'
''; '';
} }
]; ];