Merge remote-tracking branch 'origin' into prepare-for-v3.0.0

Author: scotthart

.bazelrc

@@ -42,7 +42,8 @@ build --experimental_convenience_symlinks=ignore
 # We mirror critical tarballs from several sources in case the canonical source
 # is temporarily unavailable, e.g., github.com being down. This option and flag
 # automatically rewrites the URLs.
-build --experimental_downloader_config=bazel/downloader.cfg
+# TODO(#15549) - re-enable once the downloader config is fixed.
+# build --experimental_downloader_config=bazel/downloader.cfg
 
 # It is frustrating when long-running builds/tests fail, but it is even more
 # frustrating when they fail and don't give any output. So, remove the limit.

.gemini/styleguide.md

@@ -0,0 +1,19 @@
+This repository mostly follows the Google C++ style guide found at
+https://google.github.io/styleguide/cppguide.html.
+
+This repository differs from the Google C++ style guide in the following ways:
+
+- supports C++14 as its minimum C++ standard version.
+- lists local includes first, then system includes.
+- uses std::mutex instead of absl::mutex.
+- uses google::cloud::future and google::cloud::promise instead of std::future
+  and std::promise.
+- uses google::cloud::Status and google::cloud::StatusOr instead of absl::Status
+  and absl::StatusOr.
+- prefers to factor out duplicated code if it appears 3 or more times in
+  non-test files.
+- encourages duplication of salient setup and expectations in test cases to
+  increase readability.
+
+Do not make comments of suggestions on ordering of includes as a script formats
+them how we want.

.github/workflows/codeql-analysis.yml

@@ -22,9 +22,9 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
       - name: Checkout vcpkg
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
         with:
           path: "build/vcpkg"
           repository: "microsoft/vcpkg"

.github/workflows/external-account-integration.yml

@@ -26,7 +26,7 @@ jobs:
       id-token: write
 
     steps:
-    - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
+    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
       with:
         ref: ${{ inputs.checkout-ref }}
     - id: auth

.github/workflows/macos-bazel.yml

@@ -37,7 +37,7 @@ jobs:
           targets:
           - //google/cloud/storage/...
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         ref: ${{ inputs.checkout-ref }}
     - uses: google-github-actions/auth@v2

.github/workflows/macos-cmake.yml

@@ -59,7 +59,7 @@ jobs:
         - exclude-from-full-trick: ${{ ! inputs.full-matrix }}
           shard: Other
     steps:
-    - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
+    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
       with:
         ref: ${{ inputs.checkout-ref }}
     - uses: google-github-actions/auth@v2
@@ -261,9 +261,26 @@ jobs:
       run: |
         # Remove the older CMake version
         brew unlink cmake
+
+        # Create a temporary local tap
+        cd "${{runner.temp}}"
+        mkdir -p user/homebrew-tap/Formula
+        cd user/homebrew-tap
+        git init
+
         # Download the Homebrew formula for CMake==3.27.2
         curl -fsSL -o cmake.rb https://raw.githubusercontent.com/Homebrew/homebrew-core/fd21fcf239bcd0231c9fed5719403ec128151af4/Formula/cmake.rb
-        brew install cmake.rb
+        mv cmake.rb ./Formula/
+
+        git add .
+        git commit -m "Add CMake formula"
+
+        # Tap the local repository
+        brew tap user/homebrew-tap "${{runner.temp}}/user/homebrew-tap"
+
+        # Uninstall existing CMake and install CMake from the local tap
+        brew uninstall cmake
+        brew install --build-from-source user/homebrew-tap/cmake
     - name: Download and Install sccache
       if: ${{ inputs.sccache-mode != 'DISABLED' }}
       working-directory: "${{runner.temp}}"

.github/workflows/test-runner.yml

@@ -77,15 +77,8 @@ jobs:
   # the additional jobs inherit any secrets needed to use the remote caches and
   # receive what version to checkout as an input.
   macos-bazel:
-    # Build the full matrix only on push events to the default branch, or
-    # when PR gets the has a `gha:full-build` label, or when it had the
-    # label already and it gets a new commit.
-    if: |-
-      ${{
-        github.event_name == 'schedule' ||
-        github.event_name == 'push' ||
-        contains(github.event.pull_request.labels.*.name, 'gha:full-build')
-      }}
+    # Disabled
+    if: false
     name: macOS-Bazel
     needs: [pre-flight]
     uses: ./.github/workflows/macos-bazel.yml
@@ -113,6 +106,8 @@ jobs:
       execute-integration-tests: true
     secrets: inherit
   macos-cmake:
+    # Disabled
+    if: false
     name: macOS-CMake
     needs: [pre-flight]
     uses: ./.github/workflows/macos-cmake.yml
@@ -132,6 +127,8 @@ jobs:
       execute-integration-tests: true
     secrets: inherit
   windows-cmake:
+    # Disabled
+    if: false
     name: Windows-CMake
     needs: [pre-flight]
     uses: ./.github/workflows/windows-cmake.yml
@@ -154,10 +151,10 @@ jobs:
     name: Notify-Google-Chat
     # Wait until all the other jobs have completed.
     needs:
-      - macos-bazel
-      - macos-cmake
+      # macos-bazel is disabled
+      # macos-cmake is disabled
       - windows-bazel
-      - windows-cmake
+      # windows-cmake is disabled is disabled
     # Run even if the other jobs failed or were skipped.
     if: always()
     runs-on: ubuntu-latest

.github/workflows/windows-bazel.yml

@@ -40,7 +40,7 @@ jobs:
           targets:
           - //google/cloud/storage/...
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         ref: ${{ inputs.checkout-ref }}
     - uses: google-github-actions/auth@v2

.github/workflows/windows-cmake.yml

@@ -65,7 +65,7 @@ jobs:
         - shard: Core4
           build_type: Debug
     steps:
-    - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
+    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
       with:
         ref: ${{ inputs.checkout-ref }}
     - uses: google-github-actions/auth@v2
@@ -85,11 +85,11 @@ jobs:
       shell: bash
       run: |
         echo "vcpkg-version=$(cat ci/etc/vcpkg-version.txt)" >> "${GITHUB_OUTPUT}"
-        core1_features=(bigtable)
-        core2_features=(spanner)
-        core3_features=(storage)
-        core4_features=(storage_grpc)
-        core5_features=(pubsub pubsublite)
+        core1_features=(bigtable universe_domain)
+        core2_features=(spanner universe_domain)
+        core3_features=(storage universe_domain)
+        core4_features=(storage_grpc universe_domain)
+        core5_features=(pubsub pubsublite universe_domain)
         # These are the libraries with the most "clients". To build the list
         # run something like this and create shards:
         #
@@ -107,6 +107,7 @@ jobs:
           sql
           dialogflow_cx
           dialogflow_es
+          universe_domain
         )
         shard2_features=(
           beyondcorp
@@ -119,6 +120,7 @@ jobs:
           servicecontrol
           speech
           support
+          universe_domain
         )
         shard3_features=(
           securesourcemanager
@@ -164,6 +166,7 @@ jobs:
           trace
           vision
           workflows
+          universe_domain
         )
         shard4_features=(
           accessapproval
@@ -203,6 +206,7 @@ jobs:
           gkebackup
           gkeconnect
           gkehub
+          universe_domain
         )
         shard5_features=(
           video
@@ -216,6 +220,7 @@ jobs:
           bigquery
           bigquerycontrol
           resourcemanager
+          universe_domain
         )
         if [[ "${{ matrix.shard }}" == "Core1" ]]; then
           features="$(printf ",%s" "${core1_features[@]}")"

.typos.toml

@@ -60,6 +60,8 @@ extend-exclude = [
     "docfx/doxygen2toc_test.cc",
     # If we're using a post-download patch file for googleapis.
     "external/googleapis.patch",
+    # Mispelled test names in Bigtable conformance tests
+    "google/cloud/bigtable/ci/run_conformance_tests_proxy_bazel.sh",
 ]
 
 [default]
@@ -70,5 +72,7 @@ extend-ignore-identifiers-re = [
   "NAM4",
   # Metadata is mispelled in this proto message name found in
   # google/cloud/aiplatform/v1/vizier_service.proto
-  "CheckTrialEarlyStoppingStateMetatdata"
+  "CheckTrialEarlyStoppingStateMetatdata",
+  # google/cloud/cloudsecuritycompliance/v1/deployment.proto
+  "conrol"
 ]