Skip to content

Commit 2609809

Browse files
committed
Revert to using the workspace-based rust version and fix formatting
1 parent a4b0b4a commit 2609809

File tree

5 files changed

+22386
-3669
lines changed

5 files changed

+22386
-3669
lines changed

MODULE.bazel

-17
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ bazel_dep(name = "rules_pkg", version = "1.0.1")
2626
bazel_dep(name = "rules_python", version = "1.1.0")
2727
bazel_dep(name = "rules_proto", version = "7.0.2")
2828
bazel_dep(name = "rules_ruby", version = "0.18.0")
29-
bazel_dep(name = "rules_rust", version = "0.55.6")
3029

3130
linter = use_extension("@apple_rules_lint//lint:extensions.bzl", "linter")
3231
linter.configure(
@@ -359,22 +358,6 @@ use_repo(ruby, "bundle", "ruby", "ruby_toolchains")
359358

360359
register_toolchains("@ruby_toolchains//:all")
361360

362-
rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
363-
use_repo(rust, "rust_toolchains")
364-
365-
register_toolchains("@rust_toolchains//:all")
366-
367-
crate = use_extension("@rules_rust//crate_universe:extensions.bzl", "crate")
368-
crate.from_cargo(
369-
name = "crates",
370-
cargo_lockfile = "//rust:Cargo.Bazel.lock",
371-
manifests = ["//rust:Cargo.toml"],
372-
)
373-
use_repo(
374-
crate,
375-
"crates",
376-
)
377-
378361
selenium_manager_artifacts = use_extension("//common:selenium_manager.bzl", "selenium_manager_artifacts")
379362
use_repo(
380363
selenium_manager_artifacts,

WORKSPACE

+28
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,31 @@ rules_closure_dependencies(
2020
)
2121

2222
rules_closure_toolchains()
23+
24+
# rules_rust fails to compile zstd on Windows when used with Bzlmod
25+
# so we keep it in WORKSPACE for now
26+
27+
http_archive(
28+
name = "rules_rust",
29+
integrity = "sha256-eEXiHXSGUH6qD1bdI5KXZ/B04m0wIUeoyM7pmujzbbQ=",
30+
urls = ["https://github.com/bazelbuild/rules_rust/releases/download/0.55.5/rules_rust-0.55.5.tar.gz"],
31+
)
32+
33+
load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_register_toolchains")
34+
35+
rules_rust_dependencies()
36+
37+
rust_register_toolchains()
38+
39+
load("@rules_rust//crate_universe:defs.bzl", "crates_repository")
40+
41+
crates_repository(
42+
name = "crates",
43+
cargo_lockfile = "//rust:Cargo.lock",
44+
lockfile = "//rust:Cargo.Bazel.lock",
45+
manifests = ["//rust:Cargo.toml"],
46+
)
47+
48+
load("@crates//:defs.bzl", "crate_repositories")
49+
50+
crate_repositories()

common/remote-build/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ platform(
4040
exec_properties = {
4141
"container-image": "docker://docker.io/selenium/selenium-remote-build@sha256:ca164352826812f02eaa1b4dab89adcf5b3e57deb6798dd9f15d004099db59fe",
4242
"OSFamily": "Linux",
43-
"dockerNetwork": "standard", # Allow internet access for the Rust tests
43+
"dockerNetwork": "standard", # Allow internet access for the Rust tests
4444
"dockerReuse": "True",
4545
"dockerRunAsRoot": "False",
4646
"dockerUseEntrypoint": "True",

0 commit comments

Comments
 (0)