From 9c482d6238cccbe038b11e71468ee73edd124309 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Mon, 31 Aug 2020 01:36:03 +0100 Subject: feat(ci): Add subtarget support for builds We have naturally evolved a distinction between logical and physical targets. Physical targets are those which correspond directly to a tree location on disk and can be built with `-A path.to.files`, while logical targets are those that are exported from within an expression but do not have a corresponding file on disk. This change adds support for exporting logical targets from any tree location by adding a `meta.targets` attribute containing keys into itself, which will be consumed by the CI target gathering logic and included in the generated pipeline. Note that the labels for subtargets are syntactically different to emphasise that they do not correspond to a file location. For example, this change enables 'ops.nixos.whitbySystem' as a subtarget, which is labeled in CI as `ops/nixos:whitbySystem`. Change-Id: Ied09647a62c2ba98e3914548e3742ad422c63ecf Reviewed-on: https://cl.tvl.fyi/c/depot/+/1893 Tested-by: BuildkiteCI Reviewed-by: glittershark --- default.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'default.nix') diff --git a/default.nix b/default.nix index 151d8987ea..61821bce8f 100644 --- a/default.nix +++ b/default.nix @@ -50,10 +50,25 @@ let # Walk the tree starting with 'node', recursively extending the list # of build targets with anything that looks buildable. + # + # Any tree node can specify logical targets by exporting a + # 'meta.targets' attribute containing a list of keys in itself. This + # enables target specifications that do not exist on disk directly. gather = node: if node ? __readTree then - (if eligible node then [node] else []) ++ - concatMap gather (attrValues node) + # Include the node itself if it is eligible. + (if eligible node then [ node ] else []) + # Include eligible children of the node + ++ concatMap gather (attrValues node) + # Include specified sub-targets of the node + ++ filter eligible (map + (k: (node."${k}" or {}) // { + # Keep the same tree location, but explicitly mark this + # node as a subtarget. + __readTree = node.__readTree; + __subtarget = k; + }) + (node.meta.targets or [])) else []; in fix(self: { config = config self; -- cgit 1.4.1