Add Bazel9 test

PiperOrigin-RevId: 882100299

Author: anandolee

.bazelci/presubmit.yml

@@ -1,7 +1,7 @@
 # LINT.IfChange(bazelci_presubmit)
 matrix:
   platform: ["debian10", "macos", "macos_arm64", "ubuntu2004", "windows"]
-  bazel: [8.x]
+  bazel: [8.x, 9.x]
 
 tasks:
   verify_targets:

.github/workflows/test_bazel.yml

@@ -27,7 +27,7 @@ jobs:
       fail-fast: false
       matrix:
         runner: [ ubuntu, windows, macos ]
-        bazelversion: [ '8.0.0' ]
+        bazelversion: [ '8.0.0', '9.0.0' ]
         bzlmod: [ true, false ]
         toolchain_resolution:
           # Default flags, uses from prebuilt protoc
@@ -73,7 +73,7 @@ jobs:
         uses: protocolbuffers/protobuf-ci/bazel@v5
         with:
           credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
-          bazel-cache: examples-${{ matrix.bazelversion }}-${{ matrix.bzlmod }}-${{ matrix.toolchain_resolution }}
+          bazel-cache: example-${{ matrix.bazelversion }}-${{ matrix.bzlmod }}-${{ matrix.toolchain_resolution }}
           version: ${{ matrix.bazelversion }}
           bash: >
             cd examples;
@@ -103,7 +103,7 @@ jobs:
         uses: protocolbuffers/protobuf-ci/bazel@v5
         with:
           credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
-          bazel-cache: examples-prebuilt-${{ matrix.bazelversion }}-${{ matrix.toolchain_resolution }}
+          bazel-cache: example-prebuilt-${{ matrix.bazelversion }}-${{ matrix.toolchain_resolution }}
           version: ${{ matrix.bazelversion }}
           bash: >
             cd examples/example_without_cc_toolchain;

.github/workflows/test_cpp.yml

@@ -44,6 +44,10 @@ jobs:
             cache_key: Bazel8
             image: "us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:8.0.1-d415763a389bb62a6f126b08c992e83f9f7dc1b4"
             targets: "//src/... //third_party/utf8_range/..."
+          - config: { name: "Bazel9", flags: "--cxxopt=-Wno-self-assign-overloaded --repo_contents_cache=" }
+            cache_key: Bazel9
+            image: "us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:9.0.0-7932bf8b25fb76a111e7257d151a6a58d5c3c671"
+            targets: "//src/... //third_party/utf8_range/..."
           - config: { name: "TCMalloc" }
             cache_key: TcMalloc
             image: "us-docker.pkg.dev/protobuf-build/containers/test/linux/tcmalloc:8.0.1-d415763a389bb62a6f126b08c992e83f9f7dc1b4"

MODULE.bazel

@@ -8,12 +8,19 @@ module(
     repo_name = "com_google_protobuf",
 )
 
+single_version_override(
+    module_name = "apple_support",
+    version = "2.3.0",
+)
+
 # LOWER BOUND dependency versions.
 # Bzlmod follows MVS:
 # https://bazel.build/versions/6.0.0/build/bzlmod#version-resolution
 # Thus the highest version in their module graph is resolved.
 
-bazel_dep(name = "apple_support", version = "1.16.0", repo_name = "build_bazel_apple_support")
+bazel_dep(name = "apple_support", version = "2.3.0", repo_name = "build_bazel_apple_support")
+apple_cc_configure = use_extension("@build_bazel_apple_support//crosstool:setup.bzl", "apple_cc_configure_extension")
+use_repo(apple_cc_configure, "local_config_apple_cc")
 
 # Unused but must be pinned to avoid old broken versions
 bazel_dep(name = "rules_proto", version = "7.1.0")
@@ -22,8 +29,8 @@ bazel_dep(name = "rules_proto", version = "7.1.0")
 # LINT.IfChange
 #endif // PROTO2_OPENSOURCE
 # protoc dependencies
-bazel_dep(name = "abseil-cpp", version = "20250512.1")
-bazel_dep(name = "rules_cc", version = "0.0.17")
+bazel_dep(name = "abseil-cpp", version = "20260107.0")
+bazel_dep(name = "rules_cc", version = "0.2.17")
 bazel_dep(name = "zlib", version = "1.3.1.bcr.5")
 #ifndef PROTO2_OPENSOURCE
 # LINT.ThenChange(//depot/google3/third_party/protobuf/compiler/notices.h)
@@ -39,7 +46,7 @@ bazel_dep(name = "rules_kotlin", version = "2.2.2")
 bazel_dep(name = "rules_license", version = "1.0.0")
 bazel_dep(name = "rules_pkg", version = "1.0.1")
 bazel_dep(name = "rules_python", version = "1.6.0")
-bazel_dep(name = "rules_rust", version = "0.63.0")
+bazel_dep(name = "rules_rust", version = "0.69.0")
 
 bazel_dep(name = "rules_ruby", version = "0.20.1", dev_dependency = True)
 

WORKSPACE

@@ -106,10 +106,6 @@ load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
 
 rules_pkg_dependencies()
 
-load("@build_bazel_apple_support//lib:repositories.bzl", "apple_support_dependencies")
-
-apple_support_dependencies()
-
 load("@rules_cc//cc:repositories.bzl", "rules_cc_dependencies", "rules_cc_toolchains")
 
 rules_cc_dependencies()

ci/common.bazelrc

@@ -49,8 +49,6 @@ build --incompatible_dont_use_javasourceinfoprovider
 build --incompatible_enable_android_toolchain_resolution
 build --incompatible_enable_apple_toolchain_resolution
 build --incompatible_exclusive_test_sandboxed
-build --incompatible_remote_use_new_exit_code_for_lost_inputs
-build --incompatible_sandbox_hermetic_tmp
 build --incompatible_top_level_aspects_require_providers
 build --incompatible_use_cc_configure_from_rules_cc
 
@@ -68,6 +66,8 @@ build --incompatible_use_cc_configure_from_rules_cc
 #   --incompatible_disable_objc_library_transition
 #   --incompatible_fail_on_unknown_attributes
 #   --incompatible_merge_fixed_and_default_shell_env
+#   --incompatible_remote_use_new_exit_code_for_lost_inputs
+#   --incompatible_sandbox_hermetic_tmp
 
 # For easier debugging of build failures.
 common --announce_rc

patches/apple_support_bazel9.patch

@@ -0,0 +1,4 @@
+--- /dev/null
++++ b/crosstool/BUILD
+@@ -0,0 +1,1 @@
++# Empty BUILD file for Bazel 9 compatibility

protobuf_deps.bzl

@@ -163,8 +163,8 @@ def protobuf_deps():
     if not native.existing_rule("build_bazel_apple_support"):
         http_archive(
             name = "build_bazel_apple_support",
-            sha256 = "1ae6fcf983cff3edab717636f91ad0efff2e5ba75607fdddddfd6ad0dbdfaf10",
-            url = "https://github.com/bazelbuild/apple_support/releases/download/1.24.5/apple_support.1.24.5.tar.gz",
+            sha256 = "73753c44433272c653ce710bb5f595de99f243b3885876d04a78c2ca3ba90219",
+            url = "https://github.com/bazelbuild/apple_support/releases/download/2.3.0/apple_support.2.3.0.tar.gz",
         )
 
     if not native.existing_rule("rules_kotlin"):