From aa62f106c736172ff4ccea9399ca005b43140250 Mon Sep 17 00:00:00 2001 From: Alex Rodionov Date: Wed, 17 Apr 2024 07:05:13 -0700 Subject: [PATCH] [bazel] Move rules_rust back to WORKSPACE to fix zstd compilation --- MODULE.bazel | 15 --------------- WORKSPACE | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 15 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 5ed69f6bfc555..89508a3ec7cb1 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -19,7 +19,6 @@ bazel_dep(name = "rules_pkg", version = "0.9.1") bazel_dep(name = "rules_python", version = "0.31.0") bazel_dep(name = "rules_proto", version = "5.3.0-21.7") bazel_dep(name = "rules_ruby", version = "0.8.1") -bazel_dep(name = "rules_rust", version = "0.42.1") linter = use_extension("@apple_rules_lint//lint:extensions.bzl", "linter") linter.configure( @@ -322,20 +321,6 @@ use_repo(ruby, "bundle", "ruby", "ruby_toolchains") register_toolchains("@ruby_toolchains//:all") -rust = use_extension("@rules_rust//rust:extensions.bzl", "rust") -rust.toolchain() -use_repo(rust, "rust_toolchains") - -register_toolchains("@rust_toolchains//:all") - -crate = use_extension("@rules_rust//crate_universe:extension.bzl", "crate") -crate.from_cargo( - name = "crates", - cargo_lockfile = "//rust:Cargo.lock", - manifests = ["//rust:Cargo.toml"], -) -use_repo(crate, "crates") - selenium_manager_artifacts = use_extension("//common:selenium_manager.bzl", "selenium_manager_artifacts") use_repo( selenium_manager_artifacts, diff --git a/WORKSPACE b/WORKSPACE index aea396c789541..4faaaf511644e 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -32,3 +32,31 @@ load("@io_bazel_rules_closure//closure:repositories.bzl", "rules_closure_depende rules_closure_dependencies() rules_closure_toolchains() + +# rules_rust fails to compile zstd on Windows when used with Bzlmod +# so we keep it in WORKSPACE for now + +http_archive( + name = "rules_rust", + integrity = "sha256-JLN47ZcAbx9wEr5Jiib4HduZATGLiDgK7oUi/fvotzU=", + urls = ["https://github.com/bazelbuild/rules_rust/releases/download/0.42.1/rules_rust-v0.42.1.tar.gz"], +) + +load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_register_toolchains") + +rules_rust_dependencies() + +rust_register_toolchains() + +load("@rules_rust//crate_universe:defs.bzl", "crates_repository") + +crates_repository( + name = "crates", + cargo_lockfile = "//rust:Cargo.lock", + lockfile = "//rust:Cargo.Bazel.lock", + manifests = ["//rust:Cargo.toml"], +) + +load("@crates//:defs.bzl", "crate_repositories") + +crate_repositories()