Merge remote-tracking branch 'upstream' into 19558-dont-hardcode-protoc

Author: mkruskal-google

.bazelci/README.md

@@ -0,0 +1,6 @@
+# Bazel CI test
+
+The `.bazelci/presubmit.yml` file is used by https://buildkite.com/bazel/protobuf
+to test building protobuf with Bazel on Bazel CI. It should contain the same
+set of tests as `.bcr/presubmit.yml` which is the tests that will run before
+publishing protobuf to BCR.

.bazelci/presubmit.yml

@@ -0,0 +1,21 @@
+# LINT.IfChange(bazelci_presubmit)
+matrix:
+  platform: ["debian10", "macos", "macos_arm64", "ubuntu2004", "windows"]
+  bazel: [7.x, 8.x]
+
+tasks:
+  verify_targets:
+    name: "Verify build targets"
+    working_directory: examples
+    platform: ${{ platform }}
+    bazel: ${{ bazel }}
+    build_targets:
+    - '//...'
+    - '@com_google_protobuf//:protobuf'
+    - '@com_google_protobuf//:protobuf_lite'
+    - '@com_google_protobuf//:protobuf_python'
+    - '@com_google_protobuf//:protobuf_java'
+    - '@com_google_protobuf//:protoc'
+    - '@com_google_protobuf//:test_messages_proto2_cc_proto'
+    - '@com_google_protobuf//:test_messages_proto3_cc_proto'
+# LINT.ThenChange(<ROOT_DIR>/.bcr/presubmit.yml)

.bazeliskrc

@@ -0,0 +1 @@
+USE_BAZEL_VERSION=7.1.2

.bazelrc

@@ -31,12 +31,11 @@ build:ubsan --copt=-fno-sanitize=function --copt=-fno-sanitize=vptr
 # Abseil passes nullptr to memcmp with 0 size
 build:ubsan --copt=-fno-sanitize=nonnull-attribute
 
-# TODO: migrate all dependencies from WORKSPACE to MODULE.bazel
-# https://github.com/protocolbuffers/protobuf/issues/14313
-common --noenable_bzlmod
-
 # Important: this flag ensures that we remain compliant with the C++ layering
 # check.
 build --features=layering_check
 
-common --repo_env=BAZEL_NO_APPLE_CPP_TOOLCHAIN=1
+common --enable_platform_specific_config
+
+# Use clang-cl by default on Windows (see https://github.com/protocolbuffers/protobuf/issues/20085).
+build:windows --extra_toolchains=@local_config_cc//:cc-toolchain-x64_windows-clang-cl --extra_execution_platforms=//build_defs:x64_windows-clang-cl --host_platform=//build_defs:x64_windows-clang-cl

.bcr/metadata.template.json

@@ -81,12 +81,6 @@
       "name": "Dennis Shao",
       "do_not_notify": true
     },
-    {
-      "email": "[email protected]",
-      "github": "theodorerose",
-      "name": "Theodore Rose",
-      "do_not_notify": true
-    },
     {
       "email": "[email protected]",
       "github": "tonyliaoss",

.bcr/presubmit.yml

@@ -1,36 +1,22 @@
-matrix:
-  platform: ["debian10", "macos", "ubuntu2004", "windows"]
-  bazel: [7.x]
-
-tasks:
-  verify_targets:
-    name: "Verify build targets"
-    platform: ${{ platform }}
-    bazel: ${{ bazel }}
-    build_flags:
-    - '--host_cxxopt=-std=c++17'
-    - '--cxxopt=-std=c++17'
-    build_targets:
-    - '@protobuf//:protobuf'
-    - '@protobuf//:protobuf_lite'
-    - '@protobuf//:protobuf_python'
-    - '@protobuf//:protobuf_java'
-    - '@protobuf//:protoc'
-    - '@protobuf//:test_messages_proto2_cc_proto'
-    - '@protobuf//:test_messages_proto3_cc_proto'
-
+# LINT.IfChange(bcr_presubmit)
 bcr_test_module:
-  module_path: "examples"
+  module_path: examples
   matrix:
-    platform: ["debian10", "macos", "ubuntu2004", "windows"]
-    bazel: [7.x]
+    platform: ["debian10", "macos", "macos_arm64", "ubuntu2004", "windows"]
+    bazel: [7.x, 8.x]
+
   tasks:
-    run_test_module:
-      name: "Run test module"
+    verify_targets:
+      name: "Verify build targets"
       platform: ${{ platform }}
       bazel: ${{ bazel }}
-      build_flags:
-      - '--host_cxxopt=-std=c++17'
-      - '--cxxopt=-std=c++17'
       build_targets:
-      - "//..."
+      - '//...'
+      - '@com_google_protobuf//:protobuf'
+      - '@com_google_protobuf//:protobuf_lite'
+      - '@com_google_protobuf//:protobuf_python'
+      - '@com_google_protobuf//:protobuf_java'
+      - '@com_google_protobuf//:protoc'
+      - '@com_google_protobuf//:test_messages_proto2_cc_proto'
+      - '@com_google_protobuf//:test_messages_proto3_cc_proto'
+# LINT.ThenChange(<ROOT_DIR>/.bazelci/presubmit.yml)

.github/workflows/clear_caches.yml

@@ -23,7 +23,7 @@ jobs:
       actions: write # permission is required to delete caches
       contents: read
     steps:
-      - uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920 # v3.2.4
+      - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
         with:
           path: ${{ github.workspace }}/${{ steps.output.outputs.repository-cache }}
           key: repository-cache-${{ github.ref_name }}-${{ runner.os }}-reset-${{ github.sha }}

.github/workflows/staleness_check.yml

@@ -25,7 +25,7 @@ jobs:
     if: ${{ github.event.repository.full_name == 'protocolbuffers/protobuf' }}
     steps:
       - name: Checkout
-        uses: protocolbuffers/protobuf-ci/checkout@v3
+        uses: protocolbuffers/protobuf-ci/checkout@v4
         with:
           ref: ${{ inputs.safe-checkout || github.head_ref || github.ref }}
 
@@ -48,16 +48,17 @@ jobs:
         # In branches where automatic updates work as post-submits, we don't want to run staleness
         # tests along with user changes.  Any stale files will be automatically fixed in a follow-up
         # commit.
-        uses: protocolbuffers/protobuf-ci/bazel@v3
+        uses: protocolbuffers/protobuf-ci/bazel@v4
         with:
           version: 7.1.2 # Bazel version
           credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
           bazel-cache: staleness
+          # TODO: Enable bzlmod once //python/dist is buildable.
           bash: >
             set -ex;
             echo "Please run ./regenerate_stale_files.sh to regenerate stale files";
             if [[ -z $COMMIT_TRIGGERED_RUN || -z $MAIN_RUN ]]; then
-            bazel query 'attr(tags, "staleness_test", //...)' | xargs bazel test $BAZEL_FLAGS;
+            bazel query 'attr(tags, "staleness_test", //...)' --noenable_bzlmod | xargs bazel test $BAZEL_FLAGS;
             else
-            bazel query 'attr(tags, "staleness_test", //...)';
+            bazel query 'attr(tags, "staleness_test", //...)' --noenable_bzlmod;
             fi

.github/workflows/test_bazel.yml

@@ -27,18 +27,29 @@ jobs:
       fail-fast: false
       matrix:
         runner: [ ubuntu, windows, macos ]
-        bazelversion: [ '7.1.2' ]
+        bazelversion: [ '7.1.2', '8.0.0' ]
         bzlmod: [ true, false ]
         toolchain_resolution: [ "", "--incompatible_enable_proto_toolchain_resolution=true" ]
     runs-on: ${{ matrix.runner }}-latest
     name: ${{ matrix.continuous-only && inputs.continuous-prefix || '' }} Examples ${{ matrix.runner }} ${{ matrix.bazelversion }}${{ matrix.bzlmod && ' (bzlmod)' || '' }} ${{ matrix.toolchain_resolution && ' (toolchain resolution)' || '' }}
     steps:
       - name: Checkout pending changes
         if: ${{ !matrix.continuous-only || inputs.continuous-run }}
-        uses: protocolbuffers/protobuf-ci/checkout@v3
+        uses: protocolbuffers/protobuf-ci/checkout@v4
         with:
           ref: ${{ inputs.safe-checkout }}
 
+      # rules_jvm_external doesn't support Java 8, which is the default version
+      # on some github runners.  When this is selected, it results in some
+      # opaque errors about coursier (see
+      # https://github.com/bazel-contrib/rules_jvm_external/issues/1337).
+      - name: Pin to Java 11
+        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
+        if: ${{ !matrix.continuous-only || inputs.continuous-run }}
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+
       - name: Windows startup flags
         if: ${{ runner.os == 'Windows' && (!matrix.continuous-only || inputs.continuous-run) }}
         working-directory: examples
@@ -53,9 +64,11 @@ jobs:
 
       - name: Run tests
         if: ${{ !matrix.continuous-only || inputs.continuous-run }}
-        uses: protocolbuffers/protobuf-ci/bazel@v3
+        uses: protocolbuffers/protobuf-ci/bazel@v4
         with:
           credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
           bazel-cache: examples
           version: ${{ matrix.bazelversion }}
-          bash: cd examples && bazel build //... $BAZEL_FLAGS --enable_bzlmod=${{ matrix.bzlmod }} ${{ matrix.toolchain_resolution }}
+          bash: >
+            cd examples;
+            bazel build //... @com_google_protobuf-examples-with-hyphen//... $BAZEL_FLAGS --enable_bzlmod=${{ matrix.bzlmod }} --enable_workspace=${{ !matrix.bzlmod }} ${{ matrix.toolchain_resolution }};