From 6bc87aaf25df20ad4ac1c8a09587a18153c5b558 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 15 Apr 2015 19:15:41 +0200 Subject: release.nix: Generate channels for all machines. Those channels only depend on whether the build of the particular machine succeed and currently don't include any VM tests. Also, this is quite repetitious, because we're recursing through the whole set of machines again instead of re-using the corresponding Hydra jobs. Signed-off-by: aszlig --- release.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'release.nix') diff --git a/release.nix b/release.nix index 3f6e72c5..b81ca837 100644 --- a/release.nix +++ b/release.nix @@ -24,10 +24,20 @@ in with pkgsUpstream.lib; with builtins; { }; in with releaseLib; mapTestOn (packagePlatforms releaseLib.pkgs); - channel = root.pkgs.mkChannel rec { - name = "vuizvui-channel-${version}"; - version = "${toString vuizvui.revCount}.${vuizvui.shortRev}"; - src = vuizvui; + channels = let + mkChannel = attrs: root.pkgs.mkChannel (rec { + name = "vuizvui-channel-${attrs.name or "generic"}-${version}"; + version = "${toString vuizvui.revCount}.${vuizvui.shortRev}"; + src = vuizvui; + } // removeAttrs attrs [ "name" ]); + + in { + generic = mkChannel {}; + + machines = mapAttrsRecursiveCond (m: !(m ? build)) (path: attrs: mkChannel { + name = "machine-${last path}"; + constituents = singleton attrs.build.config.system.build.toplevel; + }) (import ./machines { inherit system; }); }; manual = let -- cgit 1.4.1