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 --- ops/pipelines/depot.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'ops/pipelines') diff --git a/ops/pipelines/depot.nix b/ops/pipelines/depot.nix index 5d1f2babe123..ec7fb813278b 100644 --- a/ops/pipelines/depot.nix +++ b/ops/pipelines/depot.nix @@ -13,12 +13,19 @@ let # Create an expression that builds the target at the specified # location. - mkBuildExpr = - let descend = expr: attr: "builtins.getAttr \"${attr}\" (${expr})"; - in foldl' descend "import ./. {}"; + mkBuildExpr = target: + let + descend = expr: attr: "builtins.getAttr \"${attr}\" (${expr})"; + targetExpr = foldl' descend "import ./. {}" target.__readTree; + subtargetExpr = descend targetExpr target.__subtarget; + in if target ? __subtarget then subtargetExpr else targetExpr; # Create a pipeline label from the targets tree location. - mkLabel = concatStringsSep "/"; + mkLabel = target: + let label = concatStringsSep "/" target.__readTree; + in if target ? __subtarget + then "${label}:${target.__subtarget}" + else label; # Create a pipeline step from a single target. # @@ -27,9 +34,9 @@ let # regardless, but this data is not accessible. mkStep = target: { command = '' - nix-build -E '${mkBuildExpr target.__readTree}' || (buildkite-agent meta-data set "failure" "1"; exit 1) + nix-build -E '${mkBuildExpr target}' || (buildkite-agent meta-data set "failure" "1"; exit 1) ''; - label = ":nix: ${mkLabel target.__readTree}"; + label = ":nix: ${mkLabel target}"; }; # Protobuf check step which validates that changes to .proto files -- cgit 1.4.1