From 3318982f81c01b570b7021fd9f71aa2bfe192271 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 8 Feb 2022 02:24:29 +0300 Subject: [PATCH] chore: move some meta.targets definitions to meta.ci.targets Change-Id: Icdec1dec89158fb596c5185ac7105892081947f5 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5252 Tested-by: BuildkiteCI Reviewed-by: sterni Autosubmit: tazjin --- ops/nixos.nix | 2 +- third_party/nix/default.nix | 8 +++----- tools/cheddar/default.nix | 2 +- users/sterni/nixpkgs-crate-holes/default.nix | 2 +- users/tazjin/nixos/default.nix | 2 +- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/ops/nixos.nix b/ops/nixos.nix index 66ca188c5..3a113ac4b 100644 --- a/ops/nixos.nix +++ b/ops/nixos.nix @@ -50,5 +50,5 @@ in rec { # Systems that should be built in CI whitbySystem = (nixosFor depot.ops.machines.whitby).system; - meta.targets = [ "whitbySystem" ]; + meta.ci.targets = [ "whitbySystem" ]; } diff --git a/third_party/nix/default.nix b/third_party/nix/default.nix index 85f3625e5..d07011dd0 100644 --- a/third_party/nix/default.nix +++ b/third_party/nix/default.nix @@ -233,9 +233,7 @@ lib.fix (self: pkgs.fullLlvm11Stdenv.mkDerivation { test-vm = import ./test-vm.nix args; }; - meta = { - targets = [ - "checkfmt" - ]; - }; + meta.ci.targets = [ + "checkfmt" + ]; }) diff --git a/tools/cheddar/default.nix b/tools/cheddar/default.nix index 8d37694c0..17efae91f 100644 --- a/tools/cheddar/default.nix +++ b/tools/cheddar/default.nix @@ -17,7 +17,7 @@ depot.third_party.naersk.buildPackage { ''; }; - meta.targets = [ + meta.ci.targets = [ "about-filter" ]; } diff --git a/users/sterni/nixpkgs-crate-holes/default.nix b/users/sterni/nixpkgs-crate-holes/default.nix index f677ac8ab..4dff82d6a 100644 --- a/users/sterni/nixpkgs-crate-holes/default.nix +++ b/users/sterni/nixpkgs-crate-holes/default.nix @@ -357,5 +357,5 @@ in attr = [ "ripgrep" ]; }; - meta.targets = [ "testSingle" ]; + meta.ci.targets = [ "testSingle" ]; } diff --git a/users/tazjin/nixos/default.nix b/users/tazjin/nixos/default.nix index 04123a3b5..a1651a9d2 100644 --- a/users/tazjin/nixos/default.nix +++ b/users/tazjin/nixos/default.nix @@ -6,5 +6,5 @@ in { frogSystem = systemFor depot.users.tazjin.nixos.frog; tverskoySystem = systemFor depot.users.tazjin.nixos.tverskoy; - meta.targets = [ "camdenSystem" "frogSystem" "tverskoySystem" ]; + meta.ci.targets = [ "camdenSystem" "frogSystem" "tverskoySystem" ]; }