Skip to content

Commit b8248f6

Browse files
authored
Remove rules_rust dependency from MODULE.bazel for 30.x (#20310)
We're not yet ready for a stable Rust release, so the rules_rust dependency is unnecessary for now.
1 parent df849cc commit b8248f6

File tree

3 files changed

+4
-20
lines changed

3 files changed

+4
-20
lines changed

.github/workflows/test_rust.yml

+4-6
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,17 @@ jobs:
1818
fail-fast: false # Don't cancel all jobs if one fails.
1919
matrix:
2020
config:
21-
- { name: "No bzlmod", flags: --noenable_bzlmod }
22-
# TODO: b/379846319 - Fix the tests with bzlmod and enable this.
23-
# - { name: "bzlmod", flags: --enable_bzlmod --enable_workspace }
24-
- { name: Optimized, flags: --config=opt }
25-
- { name: ASAN, flags: --config=asan }
21+
- { name: Fastbuild, flags: --noenable_bzlmod }
22+
- { name: Optimized, flags: --noenable_bzlmod --config=opt }
23+
- { name: ASAN, flags: --noenable_bzlmod --config=asan }
2624

2725
include:
2826
- targets: "//rust/... //src/google/protobuf/compiler/rust/..."
2927
- image: "us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.1.2-27cf7b86212020d7e552bc13b1e084abb971da75"
3028
- bazel_cmd: "test"
3129

3230
# Override cases with custom images
33-
- config: { name: Cargo }
31+
- config: { name: Cargo, flags: --noenable_bzlmod }
3432
image: "us-docker.pkg.dev/protobuf-build/containers/release/linux/rust:7.1.2-1.74.0-d9624f2aa83cba3eaf906f751d75b36aacb9aa82"
3533
bazel_cmd: "run"
3634
targets: "//rust/release_crates:cargo_test"

MODULE.bazel

-13
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ bazel_dep(name = "rules_kotlin", version = "1.9.6")
2525
bazel_dep(name = "rules_license", version = "1.0.0")
2626
bazel_dep(name = "rules_pkg", version = "1.0.1")
2727
bazel_dep(name = "rules_python", version = "1.0.0")
28-
bazel_dep(name = "rules_rust", version = "0.51.0")
2928
bazel_dep(name = "platforms", version = "0.0.10")
3029
bazel_dep(name = "zlib", version = "1.3.1.bcr.5")
3130
bazel_dep(name = "bazel_features", version = "1.23.0", repo_name = "proto_bazel_features")
@@ -71,18 +70,6 @@ pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip", dev_depen
7170

7271
use_repo(pip, "protobuf_pip_deps")
7372

74-
crate = use_extension("@rules_rust//crate_universe:extension.bzl", "crate", dev_dependency = True)
75-
crate.spec(
76-
package = "googletest",
77-
version = ">0.0.0",
78-
)
79-
crate.spec(
80-
package = "paste",
81-
version = ">=1",
82-
)
83-
crate.from_specs()
84-
use_repo(crate, crate_index = "crates")
85-
8673
maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven", dev_dependency = True)
8774
maven.install(
8875
name = "protobuf_maven",

cmake/dependencies.cmake

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ set(rules_kotlin-version "1.9.6")
2323
set(rules_license-version "1.0.0")
2424
set(rules_pkg-version "1.0.1")
2525
set(rules_python-version "1.0.0")
26-
set(rules_rust-version "0.51.0")
2726
set(platforms-version "0.0.10")
2827
set(zlib-version "1.3.1.bcr.5")
2928
set(bazel_features-version "1.23.0")

0 commit comments

Comments
 (0)