diff --git a/README.md b/README.md index c5e6b92..1570632 100644 --- a/README.md +++ b/README.md @@ -108,4 +108,4 @@ There is also `.#gitlab-ci:pipeline::job-deps:` which gener Some parts of this implementation are adapted/inspired from https://gitlab.com/Cynerd/gitlab-ci-nix -[docs-soonix]: https://nix-gitlab-ci.projects.tf/soonix "Soonix Integration" +[docs-soonix]: https://nix-gitlab-ci.projects,tf/soonix "Soonix Integration" diff --git a/flake.lock b/flake.lock index 60df9c4..7c47f5c 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1764667669, - "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", + "lastModified": 1756542300, + "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "418468ac9527e799809c900eda37cbff999199b6", + "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", "type": "github" }, "original": { @@ -37,11 +37,11 @@ }, "locked": { "dir": "lib", - "lastModified": 1758738378, - "narHash": "sha256-NjzqdvQCDDdObEBH8x/vdhbdhrIB+N9E570uCdksGHY=", + "lastModified": 1756370106, + "narHash": "sha256-l84ojcHuQWBwn4BRxQsMMfQpcq/Az/sHh/hSqFgVtyg=", "owner": "rensa-nix", "repo": "core", - "rev": "abe19f9f13aff41de2b63304545c87d193d19ef4", + "rev": "9c1a29fa9ba7cbbb78b9e47eb8afbcd29303a3b4", "type": "gitlab" }, "original": { diff --git a/lib/VERSION b/lib/VERSION index ef538c2..fd2a018 100644 --- a/lib/VERSION +++ b/lib/VERSION @@ -1 +1 @@ -3.1.2 +3.1.0 diff --git a/lib/impl/modules/job.nix b/lib/impl/modules/job.nix index fd4fc62..295093d 100644 --- a/lib/impl/modules/job.nix +++ b/lib/impl/modules/job.nix @@ -646,8 +646,8 @@ in rec { }; depsDrv = cilib.mkJobDeps { key = name; + job = config.finalConfig; nixConfig = config.nix; - inherit job; }; runnerDrv = cilib.mkJobRun { key = name; diff --git a/lib/impl/modules/root.nix b/lib/impl/modules/root.nix index bd99050..84fb5ba 100644 --- a/lib/impl/modules/root.nix +++ b/lib/impl/modules/root.nix @@ -4,7 +4,7 @@ pipelineSubmodule, ... }: let - inherit (lib) mkOption types foldr; + inherit (lib) mkOption types; in rec { configSubmodule = { options = { @@ -65,7 +65,7 @@ in rec { }; }; config = { - packages = foldr (pipeline: acc: acc // pipeline) {} ( + packages = lib.fold (pipeline: acc: acc // pipeline) {} ( map (pipeline: pipeline.packages) (builtins.attrValues config.pipelines) ); soonix = config.config.soonix.finalConfig; diff --git a/nix/repo/flake.lock b/nix/repo/flake.lock index e5029e0..0627f8b 100644 --- a/nix/repo/flake.lock +++ b/nix/repo/flake.lock @@ -3,11 +3,11 @@ "devshell-lib": { "locked": { "dir": "lib", - "lastModified": 1758204313, - "narHash": "sha256-ainbY0Oajb1HMdvy+A8QxF/P5qwcbEzJGEY5pzKdDdc=", + "lastModified": 1755673398, + "narHash": "sha256-51MmR+Eo1+bKDd/Ss77wwTqi4yAR2xgmyCSEbKWSpj0=", "owner": "rensa-nix", "repo": "devshell", - "rev": "7d0c4bc78d9f017a739b0c7eb2f4e563118353e6", + "rev": "e76bef387e8a4574f9b6d37b1a424e706491af08", "type": "gitlab" }, "original": { @@ -20,11 +20,11 @@ "nixmkdocs-lib": { "locked": { "dir": "lib", - "lastModified": 1763481845, - "narHash": "sha256-Bp0+9rDmlPWMcnKqGx+BG4+o5KO8FuDAOvXRnXrm3Fo=", + "lastModified": 1757055638, + "narHash": "sha256-KHYSkEreFe4meXzSdEbknC/HwaQSNClQkc8vzHlAsMM=", "owner": "TECHNOFAB", "repo": "nixmkdocs", - "rev": "73d59093df94a894d25bc4bf71880b6f00faa62f", + "rev": "7840a5febdbeaf2da90babf6c94b3d0929d2bf74", "type": "gitlab" }, "original": { @@ -37,11 +37,11 @@ "nixtest-lib": { "locked": { "dir": "lib", - "lastModified": 1759340550, - "narHash": "sha256-EH9heYb/nHHzCpUGQGqVQnuyVGQ7D6MVMgJmzNvvmJ8=", + "lastModified": 1756812148, + "narHash": "sha256-0g8KNk4zoLApA51PBHOWqPLRYpprjrQuSzNCjfBQgu8=", "owner": "TECHNOFAB", "repo": "nixtest", - "rev": "5a7053afcbb211b9cf8fe87f7892bb9f6b76b678", + "rev": "5741109cc9ec2b6d41b56abd3f5bc51ed7a9a228", "type": "gitlab" }, "original": { @@ -63,11 +63,11 @@ "soonix-lib": { "locked": { "dir": "lib", - "lastModified": 1763323017, - "narHash": "sha256-MJyg37d+VMfRoFiVUj16FW+zkEwQXbgK9LoFF/SHoxA=", + "lastModified": 1756797658, + "narHash": "sha256-4rkyP4oaoqG/FFVL7W8U+8hGer4tOBPff/2SeN5tJYQ=", "owner": "TECHNOFAB", "repo": "soonix", - "rev": "078034b01e4eaf1f9436d46721f7cbe0d96eb8b4", + "rev": "3baef660cf8b87391d475a0455dd66fae0e60008", "type": "gitlab" }, "original": { @@ -80,11 +80,11 @@ "treefmt-nix": { "flake": false, "locked": { - "lastModified": 1762938485, - "narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=", + "lastModified": 1756662192, + "narHash": "sha256-F1oFfV51AE259I85av+MAia221XwMHCOtZCMcZLK2Jk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4", + "rev": "1aabc6c05ccbcbf4a635fb7a90400e44282f61c4", "type": "github" }, "original": { diff --git a/tests/modules_test.nix b/tests/modules_test.nix index 8ccbd83..e134293 100644 --- a/tests/modules_test.nix +++ b/tests/modules_test.nix @@ -77,27 +77,6 @@ assert_file_contains ${package} '"EXAMPLE":"/nix/store/.*-hello-.*"' ''; } - { - name = "correctly inject variables containing nix store paths at runtime"; - type = "script"; - script = let - package = - (cilib.mkCI { - pipelines."test".jobs."test" = { - stage = ".pre"; - variables.EXAMPLE = "${pkgs.hello}"; - script = []; - }; - }).packages."gitlab-ci:pipeline:test:job-deps:test"; - in - # sh - '' - ${ntlib.helpers.path [pkgs.gnugrep]} - ${ntlib.helpers.scriptHelpers} - assert_file_contains ${package} 'export PATH=":$PATH";' - assert_file_contains ${package} 'export EXAMPLE="/nix/store/.*-hello-.*"' - ''; - } ]; }; }