feat(tvix): add //tvix:shell-integration
This provides a shell containing the necessary packages to run the integration tests too. //tvix:shell stays the same. Change-Id: Iac7977cbb7dc085da698993be9baca662d09ff5f Reviewed-on: https://cl.tvl.fyi/c/depot/+/13164 Tested-by: BuildkiteCI Autosubmit: flokli <flokli@flokli.de> Reviewed-by: Connor Brewster <cbrewster@hey.com>
This commit is contained in:
parent
22d68b3100
commit
5847cbf464
2 changed files with 8 additions and 0 deletions
|
|
@ -59,6 +59,9 @@ in
|
|||
# workspace too.
|
||||
shell = (import ./shell.nix { inherit pkgs; });
|
||||
|
||||
# Shell, but with tools necessary to run the integration tests
|
||||
shell-integration = (import ./shell.nix { inherit pkgs; withIntegration = true; });
|
||||
|
||||
# Build the Rust documentation for publishing on docs.tvix.dev.
|
||||
rust-docs = pkgs.stdenv.mkDerivation {
|
||||
inherit cargoDeps src;
|
||||
|
|
@ -120,6 +123,7 @@ in
|
|||
meta.ci.targets = [
|
||||
"clippy"
|
||||
"shell"
|
||||
"shell-integration"
|
||||
"rust-docs"
|
||||
"crate2nix-check"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@
|
|||
})
|
||||
];
|
||||
})
|
||||
, withIntegration ? false
|
||||
, ...
|
||||
}:
|
||||
|
||||
|
|
@ -61,6 +62,9 @@ pkgs.mkShell {
|
|||
# `cargo build` on MacOS.
|
||||
pkgs.libiconv
|
||||
pkgs.buildPackages.darwin.apple_sdk.frameworks.Security
|
||||
] ++ pkgs.lib.optionals withIntegration [
|
||||
pkgs.cbtemulator
|
||||
pkgs.google-cloud-bigtable-tool
|
||||
];
|
||||
|
||||
# Set TVIX_BENCH_NIX_PATH to a somewhat pinned nixpkgs path.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue