Skip to content

Commit 5ce8b89

Browse files
authored
[build] unpin rules_rust (#6620)
bazelbuild/rules_rust#3812 will probably never land We can't afford to be stuck forever.
1 parent 688f691 commit 5ce8b89

7 files changed

Lines changed: 11 additions & 16 deletions

File tree

.github/workflows/coverage.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ jobs:
3636
build_container_images: false
3737
run_coverage: true
3838
run_tests: false
39+
test_target: "//src/workerd/..."
3940
secrets:
4041
BAZEL_CACHE_KEY: ${{ secrets.BAZEL_CACHE_KEY }}
4142
WORKERS_MIRROR_URL: ${{ secrets.WORKERS_MIRROR_URL }}

build/deps/build_deps.jsonc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,10 @@
6969
"type": "bazel_dep"
7070
},
7171
// rust
72+
{
73+
"name": "rules_rust",
74+
"type": "bazel_dep"
75+
},
7276
{
7377
"name": "cargo_bazel_linux_x64",
7478
"type": "github_release",

build/deps/gen/build_deps.MODULE.bazel

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,9 @@ bazel_dep(name = "rules_oci", version = "2.3.0")
116116
# rules_python
117117
bazel_dep(name = "rules_python", version = "1.9.0")
118118

119+
# rules_rust
120+
bazel_dep(name = "rules_rust", version = "0.69.0")
121+
119122
# rules_shell
120123
bazel_dep(name = "rules_shell", version = "0.8.0")
121124

build/deps/rust.MODULE.bazel

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,6 @@ RUST_TARGET_TRIPLES = [
1010
"aarch64-unknown-linux-gnu",
1111
]
1212

13-
# rules_rust
14-
bazel_dep(name = "rules_rust", version = "0.68.1")
15-
16-
# Under Bazel 9, Rust coverage is broken when using experimental_split_coverage_postprocessing.
17-
# TODO(cleanup): https://github.com/bazelbuild/rules_rust/pull/3812 should fix this, we're using
18-
# that commit for now. Switch back to regular release once resolved.
19-
archive_override(
20-
module_name = "rules_rust",
21-
integrity = "sha256-dtn87CNPspDl5xEfAGEl0eQ4HBf07vpxIdMNPRHqMqM=",
22-
strip_prefix = "bazelbuild-rules_rust-cb9d412",
23-
type = "tgz",
24-
url = "https://github.com/bazelbuild/rules_rust/tarball/cb9d412afdb95578bd533b60483eecb373119c36",
25-
)
26-
2713
rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
2814
rust.toolchain(
2915
allocator_library = "@rules_rust//ffi/rs:empty",

build/wd_rust_binary.bzl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,5 @@ def wd_rust_binary(
7575
"//conditions:default": [],
7676
}),
7777
size = test_size,
78+
tags = ["no-coverage"],
7879
)

build/wd_rust_crate.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ def wd_rust_crate(
144144
# our tests are usually very heavy and do not support concurrent invocation
145145
"RUST_TEST_THREADS": "1",
146146
} | test_env,
147-
tags = test_tags,
147+
tags = test_tags + ["no-coverage"],
148148
crate_features = crate_features,
149149
deps = test_deps,
150150
proc_macro_deps = test_proc_macro_deps,

build/wd_rust_proc_macro.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,6 @@ def wd_rust_proc_macro(
4545
# our tests are usually very heavy and do not support concurrent invocation
4646
"RUST_TEST_THREADS": "1",
4747
} | test_env,
48-
tags = test_tags,
48+
tags = test_tags + ["no-coverage"],
4949
deps = test_deps,
5050
)

0 commit comments

Comments
 (0)