Merge branch 'main' into fix_suffix_versioned_libs_link_opts

Author: UebelAndre

.bazelci/presubmit.yml

@@ -17,8 +17,8 @@ aspects_flags: &aspects_flags
   - "--config=rustfmt"
   - "--config=clippy"
 min_rust_version_shell_commands: &min_rust_version_shell_commands
-  - sed -i 's|^rust_register_toolchains(|rust_register_toolchains(versions = ["1.74.0"],\n|' WORKSPACE.bazel
-  - sed -i 's|^rust\.toolchain(|rust.toolchain(versions = ["1.74.0"],\n|' MODULE.bazel
+  - sed -i 's|^rust_register_toolchains(|rust_register_toolchains(versions = ["1.85.0"],\n|' WORKSPACE.bazel
+  - sed -i 's|^rust\.toolchain(|rust.toolchain(versions = ["1.85.0"],\n|' MODULE.bazel
 nightly_flags: &nightly_flags
   - "--//rust/toolchain/channel=nightly"
 nightly_aspects_flags: &nightly_aspects_flags
@@ -88,10 +88,19 @@ coverage_validation_post_shell_commands: &coverage_validation_post_shell_command
       ; 1>&2 cat bazel-out/_coverage/_coverage_report.dat \
       ; exit 1 \
       ; }
+  - |
+    grep -q '^LF:[1-9]' bazel-out/_coverage/_coverage_report.dat \
+    || { 1>&2 echo "Coverage report has no line data" \
+      ; 1>&2 head -50 bazel-out/_coverage/_coverage_report.dat \
+      ; exit 1 \
+      ; }
 split_coverage_postprocessing_shell_commands: &split_coverage_postprocessing_shell_commands
   - echo "coverage --experimental_fetch_all_coverage_outputs" >> user.bazelrc
   - echo "coverage --experimental_split_coverage_postprocessing" >> user.bazelrc
   - echo "build --//rust/settings:experimental_use_coverage_metadata_files" >> user.bazelrc
+rbe_coverage_flags: &rbe_coverage_flags
+  # https://github.com/bazelbuild/bazel/issues/20578
+  - "--strategy=CoverageReport=local"
 tasks:
   ubuntu2204:
     build_targets: *default_linux_targets
@@ -106,6 +115,9 @@ tasks:
       - sed -i 's/^# rbe_preconfig/rbe_preconfig/' WORKSPACE.bazel
     build_targets: *default_rbe_targets
     test_targets: *default_rbe_targets
+    coverage_targets: *default_rbe_targets
+    coverage_flags: *rbe_coverage_flags
+    post_shell_commands: *coverage_validation_post_shell_commands
   macos:
     platform: macos_arm64
     build_targets: *default_macos_targets
@@ -133,6 +145,9 @@ tasks:
     shell_commands: *no_bzlmod_rbe_shell_commands
     build_targets: *default_rbe_targets
     test_targets: *default_rbe_targets
+    coverage_targets: *default_rbe_targets
+    coverage_flags: *rbe_coverage_flags
+    post_shell_commands: *coverage_validation_post_shell_commands
   macos_no_bzlmod:
     name: No Bzlmod
     platform: macos_arm64
@@ -213,6 +228,9 @@ tasks:
     build_flags: *aspects_flags
     build_targets: *default_rbe_targets
     test_targets: *default_rbe_targets
+    coverage_targets: *default_rbe_targets
+    coverage_flags: *rbe_coverage_flags
+    post_shell_commands: *coverage_validation_post_shell_commands
   rbe_ubuntu2204_rolling_with_aspects:
     name: RBE Rolling Bazel Version With Aspects
     platform: rbe_ubuntu2204
@@ -221,6 +239,9 @@ tasks:
       - sed -i 's/^# rbe_preconfig/rbe_preconfig/' WORKSPACE.bazel
     build_targets: *default_rbe_targets
     test_targets: *default_rbe_targets
+    coverage_targets: *default_rbe_targets
+    coverage_flags: *rbe_coverage_flags
+    post_shell_commands: *coverage_validation_post_shell_commands
     build_flags: *aspects_flags
     soft_fail: yes
     bazel: "rolling"
@@ -949,12 +970,6 @@ tasks:
     working_directory: examples/proto
     build_targets:
       - "//..."
-  bzlmod_protoc:
-    name: Proto and Prost with prebuilt protoc with bzlmod
-    platform: ubuntu2204
-    working_directory: examples/proto_with_toolchain
-    build_targets:
-      - "//..."
   compile_one_dependency:
     name: --compile_one_dependency flag
     platform: ubuntu2204
@@ -1095,49 +1110,6 @@ tasks:
       - "//..."
     test_targets:
       - "//..."
-  extensions_protobuf_linux:
-    platform: ubuntu2204
-    name: Extensions Protobuf
-    working_directory: extensions/protobuf
-    build_flags: *aspects_flags
-    test_flags: *aspects_flags
-    build_targets:
-      - "//..."
-    test_targets:
-      - "//..."
-  extensions_protobuf_linux_rbe:
-    platform: rbe_ubuntu2204
-    name: Extensions Protobuf
-    working_directory: extensions/protobuf
-    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_protobuf_macos:
-    platform: macos_arm64
-    name: Extensions Protobuf
-    working_directory: extensions/protobuf
-    build_flags: *aspects_flags
-    test_flags: *aspects_flags
-    build_targets:
-      - "//..."
-    test_targets:
-      - "//..."
-  extensions_protobuf_windows:
-    platform: windows
-    name: Extensions Protobuf
-    working_directory: extensions/protobuf
-    build_flags: *aspects_flags
-    test_flags: *aspects_flags
-    build_targets:
-      - "//..."
-    test_targets:
-      - "//..."
   extensions_pyo3_linux:
     platform: ubuntu2204
     name: Extensions PyO3

.bazelrc

@@ -18,6 +18,7 @@ coverage --combined_report=lcov
 # Avoid fully cached builds reporting no coverage and failing CI
 # https://bazel.build/reference/command-line-reference#flag--experimental_fetch_all_coverage_outputs
 coverage --experimental_fetch_all_coverage_outputs
+coverage --experimental_split_coverage_postprocessing
 
 # Required for some of the tests
 # https://bazel.build/reference/command-line-reference#flag--experimental_cc_shared_library

.bazelversion

@@ -3,6 +3,5 @@ moduleRoots:
   - "extensions/bindgen"
   - "extensions/mdbook"
   - "extensions/prost"
-  - "extensions/protobuf"
   - "extensions/pyo3"
   - "extensions/wasm_bindgen"

.bcr/config.yml

@@ -6,7 +6,7 @@ bcr_test_module:
       - "ubuntu2004"
       # # TODO: https://github.com/bazelbuild/rules_rust/issues/2009
       # - "windows"
-    bazel: ["7.x", "8.x"]
+    bazel: ["7.x", "8.x", "9.x"]
   tasks:
     run_tests:
       name: "Run test module"

.bcr/extensions/bindgen/presubmit.yml

@@ -2,7 +2,7 @@ bcr_test_module:
   module_path: ""
   matrix:
     platform: ["macos_arm64", "ubuntu2004", "windows"]
-    bazel: ["7.x", "8.x"]
+    bazel: ["7.x", "8.x", "9.x"]
   tasks:
     run_tests:
       name: "Run test module"

.bcr/extensions/mdbook/presubmit.yml

@@ -2,7 +2,7 @@ bcr_test_module:
   module_path: ""
   matrix:
     platform: ["macos_arm64", "ubuntu2004", "windows"]
-    bazel: ["7.x", "8.x"]
+    bazel: ["7.x", "8.x", "9.x"]
   tasks:
     run_tests:
       name: "Run test module"