From 971381ef6e0c105d25f90515f0f260de76945cad Mon Sep 17 00:00:00 2001 From: UebelAndre Date: Mon, 2 Dec 2024 15:19:06 -0800 Subject: [PATCH] debug2 --- .bazelrc | 4 ++++ crate_universe/tests/cargo_integration_test.rs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.bazelrc b/.bazelrc index 45d5f5fddf..09a2ccea5c 100644 --- a/.bazelrc +++ b/.bazelrc @@ -64,6 +64,10 @@ build --incompatible_merge_fixed_and_default_shell_env ## Bzlmod ############################################################################### +# TODO: migrate all dependencies from WORKSPACE to MODULE.bazel +# https://github.com/bazelbuild/rules_rust/issues/2181 +common --noenable_bzlmod --enable_workspace + # Disable the bzlmod lockfile, so we don't accidentally commit MODULE.bazel.lock common --lockfile_mode=off diff --git a/crate_universe/tests/cargo_integration_test.rs b/crate_universe/tests/cargo_integration_test.rs index 80073f5138..d3c3c84ec3 100644 --- a/crate_universe/tests/cargo_integration_test.rs +++ b/crate_universe/tests/cargo_integration_test.rs @@ -521,7 +521,7 @@ fn run(repository_name: &str, manifests: HashMap, lockfile: &str fn host_specific_build_deps() { if should_skip_test() { eprintln!("Skipping!"); - return; + panic!("HERE"); } cargo_bazel::cli::init_logging("Splice", true);