Skip to content

Commit

Permalink
deps: update rules_cc to v0.0.13
Browse files Browse the repository at this point in the history
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
  • Loading branch information
renovate[bot] authored Oct 13, 2024
1 parent a24ad9f commit 27b280d
Show file tree
Hide file tree
Showing 10 changed files with 8,767 additions and 307 deletions.
40 changes: 31 additions & 9 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ use_repo(
bazel_dep(name = "gflags", version = "2.2.2")
bazel_dep(name = "googleapis", version = "0.0.0-20240819-fe8ba054a")
bazel_dep(name = "googletest", version = "1.15.2")
bazel_dep(name = "grpc", version = "1.66.0.bcr.1")
bazel_dep(name = "grpc-java", version = "1.64.0")
bazel_dep(name = "rules_cc", version = "0.0.9")
bazel_dep(name = "grpc", version = "1.66.0.bcr.2")
bazel_dep(name = "grpc-java", version = "1.66.0")
bazel_dep(name = "rules_cc", version = "0.0.13")
bazel_dep(name = "rules_cue", version = "0.8.1")
bazel_dep(name = "rules_foreign_cc", version = "0.12.0")
bazel_dep(name = "rules_go", version = "0.50.1")
Expand Down Expand Up @@ -139,14 +139,36 @@ use_repo(ruby, "bundle", "ruby_toolchains")
register_toolchains("@ruby_toolchains//:all")

bazel_dep(name = "rules_rust", version = "0.47.1")
single_version_override(
module_name = "rules_rust",
patch_strip = 1,
patches = [
# rules_rust and modern protoc collide on protoc-gen-rust and create
# the following error message:
#
# --rust_out: helloworld/helloworld.proto: The Rust codegen is highly experimental.
# Future versions will break existing code. Use at your own risk. You can opt-in
# by passing 'experimental-codegen=enabled' to '--rust_out'.
#
# This error message is also metionned in https://github.com/protocolbuffers/protobuf/issues/13346.
#
# Instead we rename the rules_rust protoc proto and grpc plugin to
# denote rules_rust wants its own code ran, not the experiemental
# code from the protobuf repository.
#
# All this is reported upstream in https://github.com/bazelbuild/rules_rust/issues/2837.
"//third_party/rules_rust:0001-rust-proto-experimental.patch",
],
)

# rules_rust 0.45.1 does not work with protobuf 23.1 and this breaks `bazel test src/rust/...`
# Use a more modern version of protobuf to work around rules_rust using
# an old one and grpc-java needed a modern one. See:
#
# --rust_out: helloworld/helloworld.proto: The Rust codegen is highly experimental. Future versions will break existing code.
# Use at your own risk. You can opt-in by passing 'experimental-codegen=enabled' to '--rust_out'.
# - https://github.com/bazelbuild/rules_rust/issues/302
# - https://github.com/grpc/grpc-java/issues/11015
single_version_override(
module_name = "protobuf",
version = "21.7",
version = "29.0-rc1",
)

rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
Expand All @@ -160,7 +182,7 @@ register_toolchains("@rust_toolchains//:all")

crate = use_extension("@rules_rust//crate_universe:extension.bzl", "crate")
crate.from_cargo(
name = "crates",
name = "everest_crates", # FIXME protobuf uses the name "crates", so we namespace ours
cargo_lockfile = "//:Cargo.lock",
manifests = [
"//:Cargo.toml",
Expand All @@ -172,7 +194,7 @@ crate.from_cargo(
"//src/rust/web:Cargo.toml",
],
)
use_repo(crate, "crates")
use_repo(crate, "everest_crates")

bazel_dep(name = "rules_haskell", version = "0.19")

Expand Down
8,126 changes: 7,841 additions & 285 deletions MODULE.bazel.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/rust/cel/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("@crates//:defs.bzl", "all_crate_deps")
load("@everest_crates//:defs.bzl", "all_crate_deps")
load("@rules_rust//rust:defs.bzl", "rust_binary", "rust_test")

rust_binary(
Expand Down
2 changes: 1 addition & 1 deletion src/rust/hello_world/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("@crates//:defs.bzl", "aliases", "all_crate_deps")
load("@everest_crates//:defs.bzl", "aliases", "all_crate_deps")
load("@rules_rust//rust:defs.bzl", "rust_binary")
load("//tools/test/binary:binary.bzl", "binary_test")

Expand Down
2 changes: 1 addition & 1 deletion src/rust/num/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("@crates//:defs.bzl", "aliases", "all_crate_deps")
load("@everest_crates//:defs.bzl", "aliases", "all_crate_deps")
load("@rules_python//python:defs.bzl", "py_library")
load("@rules_rust//rust:defs.bzl", "rust_shared_library")

Expand Down
2 changes: 1 addition & 1 deletion src/rust/web/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("@crates//:defs.bzl", "aliases", "all_crate_deps")
load("@everest_crates//:defs.bzl", "aliases", "all_crate_deps")
load("@rules_rust//rust:defs.bzl", "rust_binary", "rust_test")

rust_binary(
Expand Down
4 changes: 2 additions & 2 deletions third_party/haskell/stackage_snapshot.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"__GENERATED_FILE_DO_NOT_MODIFY_MANUALLY": 896764075,
"all-cabal-hashes": "https://raw.githubusercontent.com/commercialhaskell/all-cabal-hashes/2fcc7385c142aa453a29568a4594caab9bc87e35",
"__GENERATED_FILE_DO_NOT_MODIFY_MANUALLY": 1642265809,
"all-cabal-hashes": "https://raw.githubusercontent.com/commercialhaskell/all-cabal-hashes/b80dff7bb8ead898d3efd22c6d08daf65c4f6ccf",
"resolved": {
"HUnit": {"dependencies":["base","call-stack","deepseq"],"location":{"type":"hackage","url":"https://hackage.haskell.org/package/HUnit-1.6.2.0/HUnit-1.6.2.0.tar.gz"},"name":"HUnit","pinned":{"cabal-sha256":"1a79174e8af616117ad39464cac9de205ca923da6582825e97c10786fda933a4","sha256":"b0b7538871ffc058486fc00740886d2f3172f8fa6869936bfe83a5e10bd744ab","url":["https://hackage.haskell.org/package/HUnit-1.6.2.0/HUnit-1.6.2.0.tar.gz","https://s3.amazonaws.com/hackage.fpcomplete.com/package/HUnit-1.6.2.0.tar.gz"]},"version":"1.6.2.0"},
"ansi-terminal": {"dependencies":["ansi-terminal-types","base","colour"],"location":{"type":"hackage","url":"https://hackage.haskell.org/package/ansi-terminal-1.0.2/ansi-terminal-1.0.2.tar.gz"},"name":"ansi-terminal","pinned":{"cabal-sha256":"1f90bb88e670ce63fbf2c9216d50857f2419582f1c6791e542c3eab97ecfd364","sha256":"46e516cbf66c7807940ba9896c2d71ba5ffdaa35a4fb80dea9313703efa8d834","url":["https://hackage.haskell.org/package/ansi-terminal-1.0.2/ansi-terminal-1.0.2.tar.gz","https://s3.amazonaws.com/hackage.fpcomplete.com/package/ansi-terminal-1.0.2.tar.gz"]},"version":"1.0.2"},
Expand Down
Loading

0 comments on commit 27b280d

Please sign in to comment.