Skip to content

Commit 5e90483

Browse files
authored
Updated crate_universe bzlmod to support skipping splicing (#3148)
Additional Changes: - Updated crate_universe macros to refer to aliases instead of direct external target for bzlmod support. - Added `rust_host_tools_nightly` module for exposing a nightly toolchain - Converted `examples/crate_universe` to use bzlmod
1 parent 1d0fe8a commit 5e90483

File tree

459 files changed

+6181
-4468
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

459 files changed

+6181
-4468
lines changed

.bazelci/presubmit.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,9 +429,15 @@ tasks:
429429
- sed -i 's/^# rbe_preconfig/rbe_preconfig/' WORKSPACE.bazel
430430
run_targets: *crate_universe_vendor_example_targets
431431
build_targets:
432+
- "--"
432433
- "//..."
434+
# TODO: Fix boringssl on RBE
435+
- "-//complicated_dependencies/..."
433436
test_targets:
437+
- "--"
434438
- "//..."
439+
# TODO: Fix boringssl on RBE
440+
- "-//complicated_dependencies/..."
435441
build_flags: *aspects_flags
436442
crate_universe_examples_macos:
437443
name: Crate Universe Examples

MODULE.bazel

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ bazel_dep(
4242
internal_deps = use_extension("//rust/private:internal_extensions.bzl", "i")
4343
use_repo(
4444
internal_deps,
45+
"rrra",
4546
"rrra__anyhow-1.0.71",
4647
"rrra__clap-4.3.11",
4748
"rrra__env_logger-0.10.0",
@@ -61,7 +62,18 @@ register_toolchains(
6162
)
6263

6364
rust_host_tools = use_extension("//rust:extensions.bzl", "rust_host_tools")
64-
use_repo(rust_host_tools, "rust_host_tools")
65+
rust_host_tools.host_tools(
66+
name = "rust_host_tools",
67+
)
68+
rust_host_tools.host_tools(
69+
name = "rust_host_tools_nightly",
70+
version = "nightly",
71+
)
72+
use_repo(
73+
rust_host_tools,
74+
"rust_host_tools",
75+
"rust_host_tools_nightly",
76+
)
6577

6678
rust_test = use_extension("//test:test_extensions.bzl", "rust_test", dev_dependency = True)
6779
use_repo(
@@ -70,8 +82,8 @@ use_repo(
7082
"generated_inputs_in_external_repo",
7183
"libc",
7284
"rtra",
73-
"rtra__serde-1.0.216",
74-
"rtra__serde_json-1.0.133",
85+
"rtra__serde-1.0.217",
86+
"rtra__serde_json-1.0.134",
7587
"rules_rust_test_load_arbitrary_tool",
7688
"rules_rust_toolchain_test_target_json",
7789
)

0 commit comments

Comments
 (0)