Merge branch 'main' into bzlmod

.bazelci/presubmit.yml

@@ -923,6 +923,49 @@ tasks:
   #   test_targets:
   #     - "--"
   #     - "//..."
+  extensions_prost_linux:
+    platform: ubuntu2004
+    name: Extensions Prost
+    working_directory: extensions/prost
+    build_flags: *aspects_flags
+    test_flags: *aspects_flags
+    build_targets:
+      - "//..."
+    test_targets:
+      - "//..."
+  extensions_prost_linux_rbe:
+    platform: rbe_ubuntu2004
+    name: Extensions Prost
+    working_directory: extensions/prost
+    shell_commands:
+      - sed -i 's/^# load("@bazel_ci_rules/load("@bazel_ci_rules/' WORKSPACE.bazel
+      - sed -i 's/^# rbe_preconfig/rbe_preconfig/' WORKSPACE.bazel
+    build_flags: *aspects_flags
+    test_flags: *aspects_flags
+    build_targets:
+      - "//..."
+    test_targets:
+      - "//..."
+  extensions_prost_macos:
+    platform: macos_arm64
+    name: Extensions Prost
+    working_directory: extensions/prost
+    build_flags: *aspects_flags
+    test_flags: *aspects_flags
+    build_targets:
+      - "//..."
+    test_targets:
+      - "//..."
+  extensions_prost_windows:
+    platform: windows
+    name: Extensions Prost
+    working_directory: extensions/prost
+    build_flags: *aspects_flags
+    test_flags: *aspects_flags
+    build_targets:
+      - "//..."
+    test_targets:
+      - "//..."
   extensions_protobuf_linux:
     platform: ubuntu2004
     name: Extensions Protobuf

.bazelrc

@@ -5,9 +5,6 @@
 ## https://bazel.build/docs/best-practices#bazelrc-file
 ###############################################################################
 
-# Skip building runfiles links for faster builds.
-build --nobuild_runfile_links
-
 # https://bazel.build/reference/command-line-reference#flag--enable_platform_specific_config
 common --enable_platform_specific_config
 

extensions/prost/MODULE.bazel

@@ -14,6 +14,10 @@ local_path_override(
     path = "../..",
 )
 
+bazel_dep(
+    name = "platforms",
+    version = "0.0.10",
+)
 bazel_dep(
     name = "bazel_skylib",
     version = "1.7.1",
@@ -35,16 +39,16 @@ bazel_dep(
 rust_ext = use_extension("//:extensions.bzl", "rust_ext")
 use_repo(
     rust_ext,
-    "rules_rust_prost_deps",
-    "rules_rust_prost_deps__h2-0.4.6",
-    "rules_rust_prost_deps__heck",
-    "rules_rust_prost_deps__prost-0.13.1",
-    "rules_rust_prost_deps__prost-types-0.13.1",
-    "rules_rust_prost_deps__protoc-gen-prost-0.4.0",
-    "rules_rust_prost_deps__protoc-gen-tonic-0.4.1",
-    "rules_rust_prost_deps__tokio-1.39.3",
-    "rules_rust_prost_deps__tokio-stream-0.1.15",
-    "rules_rust_prost_deps__tonic-0.12.1",
+    "rrprd",
+    "rrprd__h2-0.4.6",
+    "rrprd__heck",
+    "rrprd__prost-0.13.1",
+    "rrprd__prost-types-0.13.1",
+    "rrprd__protoc-gen-prost-0.4.0",
+    "rrprd__protoc-gen-tonic-0.4.1",
+    "rrprd__tokio-1.39.3",
+    "rrprd__tokio-stream-0.1.15",
+    "rrprd__tonic-0.12.1",
 )
 
 register_toolchains(

extensions/prost/private/3rdparty/BUILD.bazel

@@ -40,7 +40,9 @@ crates_vendor(
             version = "0.12.1",
         ),
     },
-    repository_name = "rules_rust_prost_deps",
+    # Shorten the repository name to avoid MAX_PATH issues on Windows
+    # `rules_rust_prost_deps` == `rrprd`
+    repository_name = "rrprd",
     tags = ["manual"],
 )