diff options
| author | Vincent Ambo <mail@tazj.in> | 2022-01-19T17·57+0300 |
|---|---|---|
| committer | tazjin <tazjin@tvl.su> | 2022-01-20T07·40+0000 |
| commit | effcd31651c60e6bbd7db8e96a44d1278fa4bd39 (patch) | |
| tree | a050333eb8bb6ba5c9a6f9dcf7ded00094ee0a11 | |
| parent | 0652ac0ace548ba6ea4b6b78fc7bbfee277ec5d0 (diff) | |
refactor: Replace 'meta.ci' -> 'meta.ci.skip' r/3638
We need 'meta.ci' to be an attribute set for new CI features. Change-Id: I83d04e2d74e42e49fe739b049ee4ba799f6d5d86 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5007 Tested-by: BuildkiteCI Reviewed-by: ezemtsov <eugene.zemtsov@gmail.com> Reviewed-by: wpcarro <wpcarro@gmail.com>
| -rw-r--r-- | default.nix | 4 | ||||
| -rw-r--r-- | third_party/overlays/tvl.nix | 2 | ||||
| -rw-r--r-- | users/wpcarro/boilerplate/typescript/default.nix | 2 | ||||
| -rw-r--r-- | users/wpcarro/website/sandbox/contentful/default.nix | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/default.nix b/default.nix index db2c503559..bd2c6012fb 100644 --- a/default.nix +++ b/default.nix @@ -65,10 +65,10 @@ let # To determine build targets, we walk through the depot tree and # fetch attributes that were imported by readTree and are buildable. # - # Any build target that contains `meta.ci = false` will be skipped. + # Any build target that contains `meta.ci.skip = true` will be skipped. # Is this tree node eligible for build inclusion? - eligible = node: (node ? outPath) && (node.meta.ci or true); + eligible = node: (node ? outPath) && (!node.meta.ci.skip or true); in readTree.fix(self: (readDepot { depot = self; diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index f7b1536069..7105dc59c2 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -47,6 +47,6 @@ self: super: { # Avoid builds of mkShell derivations in CI. mkShell = super.lib.makeOverridable(args: (super.mkShell args) // { - meta.ci = false; + meta.ci.skip = true; }); } diff --git a/users/wpcarro/boilerplate/typescript/default.nix b/users/wpcarro/boilerplate/typescript/default.nix index d27162d345..84949cae7f 100644 --- a/users/wpcarro/boilerplate/typescript/default.nix +++ b/users/wpcarro/boilerplate/typescript/default.nix @@ -19,5 +19,5 @@ pkgs.stdenv.mkDerivation { ''; # TODO(wpcarro): This doesn't build at all. - meta.ci = false; + meta.ci.skip = true; } diff --git a/users/wpcarro/website/sandbox/contentful/default.nix b/users/wpcarro/website/sandbox/contentful/default.nix index 6b0151afae..ce7e534b23 100644 --- a/users/wpcarro/website/sandbox/contentful/default.nix +++ b/users/wpcarro/website/sandbox/contentful/default.nix @@ -20,5 +20,5 @@ pkgs.stdenv.mkDerivation { ''; # TODO(wpcarro): This doesn't build at all. - meta.ci = false; + meta.ci.skip = true; } |