Skip to content

Commit

Permalink
Remove rules_rust dependency from MODULE.bazel for 30.x (#20310)
Browse files Browse the repository at this point in the history
We're not yet ready for a stable Rust release, so the rules_rust
dependency is unnecessary for now.
  • Loading branch information
acozzette authored Feb 12, 2025
1 parent df849cc commit b8248f6
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 20 deletions.
10 changes: 4 additions & 6 deletions .github/workflows/test_rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,17 @@ jobs:
fail-fast: false # Don't cancel all jobs if one fails.
matrix:
config:
- { name: "No bzlmod", flags: --noenable_bzlmod }
# TODO: b/379846319 - Fix the tests with bzlmod and enable this.
# - { name: "bzlmod", flags: --enable_bzlmod --enable_workspace }
- { name: Optimized, flags: --config=opt }
- { name: ASAN, flags: --config=asan }
- { name: Fastbuild, flags: --noenable_bzlmod }
- { name: Optimized, flags: --noenable_bzlmod --config=opt }
- { name: ASAN, flags: --noenable_bzlmod --config=asan }

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

# Override cases with custom images
- config: { name: Cargo }
- config: { name: Cargo, flags: --noenable_bzlmod }
image: "us-docker.pkg.dev/protobuf-build/containers/release/linux/rust:7.1.2-1.74.0-d9624f2aa83cba3eaf906f751d75b36aacb9aa82"
bazel_cmd: "run"
targets: "//rust/release_crates:cargo_test"
Expand Down
13 changes: 0 additions & 13 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ bazel_dep(name = "rules_kotlin", version = "1.9.6")
bazel_dep(name = "rules_license", version = "1.0.0")
bazel_dep(name = "rules_pkg", version = "1.0.1")
bazel_dep(name = "rules_python", version = "1.0.0")
bazel_dep(name = "rules_rust", version = "0.51.0")
bazel_dep(name = "platforms", version = "0.0.10")
bazel_dep(name = "zlib", version = "1.3.1.bcr.5")
bazel_dep(name = "bazel_features", version = "1.23.0", repo_name = "proto_bazel_features")
Expand Down Expand Up @@ -71,18 +70,6 @@ pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip", dev_depen

use_repo(pip, "protobuf_pip_deps")

crate = use_extension("@rules_rust//crate_universe:extension.bzl", "crate", dev_dependency = True)
crate.spec(
package = "googletest",
version = ">0.0.0",
)
crate.spec(
package = "paste",
version = ">=1",
)
crate.from_specs()
use_repo(crate, crate_index = "crates")

maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven", dev_dependency = True)
maven.install(
name = "protobuf_maven",
Expand Down
1 change: 0 additions & 1 deletion cmake/dependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ set(rules_kotlin-version "1.9.6")
set(rules_license-version "1.0.0")
set(rules_pkg-version "1.0.1")
set(rules_python-version "1.0.0")
set(rules_rust-version "0.51.0")
set(platforms-version "0.0.10")
set(zlib-version "1.3.1.bcr.5")
set(bazel_features-version "1.23.0")
Expand Down

0 comments on commit b8248f6

Please sign in to comment.