technofab/nix-gitlab-ci
1
0
Fork 0
mirror of https://gitlab.com/TECHNOFAB/nix-gitlab-ci.git synced 2026-06-19 08:39:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: pipelines can have either trigger or script

Browse source 
They canno thave both, so here I add assertions support and use them to avoid this case.
This commit is contained in:
Jairo Llopis 2026-05-13 08:53:15 +01:00
parent 097f775cff
commit 70dc878112
No known key found for this signature in database
GPG key ID: B24A1D10508180D8
8 changed files with 107 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/impl/modules/pipeline.nix
View file

@ -2,9 +2,10 @@
lib,
cilib,
jobSubmodule,
pkgs,
...
}: let
inherit (lib) mkOption types filterAttrs mergeAttrsList mapAttrs mkRenamedOptionModule literalExpression;
inherit (lib) mkOption types filterAttrs mergeAttrsList mapAttrs mkRenamedOptionModule literalExpression attrValues;
inherit (cilib.helpers) filterUnset unset mkUnsetOption toYaml toYamlPretty eitherWithSubOptions;
pipelineConfigSubmodule = {rootConfig, ...}: {
@ -153,7 +154,7 @@
in {
_file = ./pipeline.nix;
# from https://docs.gitlab.com/ci/yaml/#default
imports = builtins.map (val: mkRenamedOptionModule [val] ["default" val]) [
imports = [(pkgs.path + /nixos/modules/misc/assertions.nix)] ++ builtins.map (val: mkRenamedOptionModule [val] ["default" val]) [
"after_script"
"artifacts"
"before_script"
@ -211,16 +212,20 @@
// gitlabOptions;
config = let
attrsToKeep = builtins.attrNames gitlabOptions;
jobs = config.jobs;
# Propagate job assertions up to pipeline level
jobAssertions = lib.concatLists (map (job: job.assertions) (attrValues jobs));
in {
assertions = jobAssertions;
finalConfig =
(filterUnset (filterAttrs (n: _v: builtins.elem n attrsToKeep) config))
// mapAttrs (_name: value: value.finalConfig) config.jobs;
// mapAttrs (_name: value: value.finalConfig) jobs;
packages =
{
"gitlab-ci:pipeline:${name}" = toYaml "gitlab-ci-config.json" config.finalConfig;
"gitlab-ci:pipeline:${name}:pretty" = toYamlPretty "gitlab-ci-config.yml" config.finalConfig;
}
// mergeAttrsList (map (job: job.packages) (builtins.attrValues config.jobs));
// mergeAttrsList (map (job: job.packages) (builtins.attrValues jobs));
};
};
in {