the meta flake takes docs from the pinned hyperhive input
This commit is contained in:
parent
bb13909d8e
commit
daf38e4c55
16 changed files with 29 additions and 197 deletions
|
|
@ -51,8 +51,7 @@ let
|
|||
|
||||
# The check flake on the inputs the builder's unit names, called as
|
||||
# `nix build` calls it. `hyperhive` is entered through the filtered source's
|
||||
# own `flake.nix`, so its agent base sees the tree without `docs/` that a
|
||||
# real build gets; `self`'s own agent base would find `docs/` here.
|
||||
# own `flake.nix`.
|
||||
builderCheck =
|
||||
agentModule:
|
||||
let
|
||||
|
|
@ -69,7 +68,6 @@ let
|
|||
in
|
||||
((import "${env.SWARM_BUILDER_CHECK_FLAKE}/flake.nix").outputs {
|
||||
inherit hyperhive;
|
||||
hyperhive-docs.outPath = env.SWARM_BUILDER_HYPERHIVE_DOCS_FLAKE;
|
||||
agent.nixosModules.default = agentModule;
|
||||
}).packages.x86_64-linux.check;
|
||||
|
||||
|
|
@ -136,11 +134,10 @@ let
|
|||
}
|
||||
{
|
||||
# The check builds on the sources this host was deployed with, so a green check means
|
||||
# the same hyperhive, docs and nixpkgs base.
|
||||
name = "the builder builds on the hyperhive, docs and nixpkgs this host's hives use";
|
||||
# the same hyperhive and nixpkgs base.
|
||||
name = "the builder builds on the hyperhive and nixpkgs this host was deployed with";
|
||||
ok =
|
||||
env.SWARM_BUILDER_HYPERHIVE_FLAKE == withBuilder.services.hyperhive.c0re.hyperhiveFlake
|
||||
&& env.SWARM_BUILDER_HYPERHIVE_DOCS_FLAKE == withBuilder.services.hyperhive.c0re.hyperhiveDocs
|
||||
&& env.SWARM_BUILDER_NIXPKGS_FLAKE == withBuilder.services.hyperhive.c0re.nixpkgsFlake
|
||||
&& lib.hasSuffix "-check-flake" env.SWARM_BUILDER_CHECK_FLAKE
|
||||
&& env.SWARM_BUILDER_CONFIG_ORG == "agent-configs"
|
||||
|
|
|
|||
Loading…
Reference in a new issue