From c3832e1a78cdc73f8a2eeed6a3c72f2f1b3e446c Mon Sep 17 00:00:00 2001
From: Daniel Sanche <d.sanche14@gmail.com>
Date: Tue, 6 Oct 2026 17:15:17 -0700
Subject: [PATCH 1/2] chore(tests): re-introduce docfx pre-submit

---
 .github/workflows/docs.yml | 44 ++++++++++++++++++++++++++++++++++----
 1 file changed, 40 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index e8fe1a06f6f2..142e8b34f1a4 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -24,6 +24,7 @@ env:
   NOX_ENVDIR: "/tmp/shared_nox_envs"
   NOX_DEFAULT_VENV_BACKEND: "uv"
   UV_VENV_SEED: "1"
+  UV_CONCURRENT_BUILDS: "1"
   # Run checks in parallel using 4 cores
   PARALLEL_WORKERS: "4"
 
@@ -41,7 +42,7 @@ jobs:
       PACKAGE_WEIGHTS: |
         google-ads-admanager: 9
         google-cloud-compute: 50
-        google-cloud-compute-v1beta: 100
+        google-cloud-compute-v1beta: 120
         google-cloud-dialogflow: 9
         google-cloud-dialogflow-cx: 9
         google-cloud-discoveryengine: 15
@@ -136,9 +137,15 @@ jobs:
         fi
         echo "All docs shards passed or were skipped!"
 
-  docfx:
-    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+  docfx-shard:
+    needs: initialize
+    if: needs.initialize.outputs.matrix != '[]' && needs.initialize.outputs.matrix != ''
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+      matrix:
+        package_shard: ${{ fromJson(needs.initialize.outputs.matrix) }}
+    name: ${{ matrix.package_shard.is_sharded && format('docfx ({0})', matrix.package_shard.name) || format('docfx ({0})', matrix.package_shard.description) }}
     steps:
     - name: Checkout
       uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
@@ -156,12 +163,41 @@ jobs:
       run: |
         python -m pip install --upgrade setuptools pip wheel
         python -m pip install nox uv
-    - name: Run docfx
+    - name: Build local gcp-sphinx-docfx-yaml wheel
+      run: |
+        mkdir -p /tmp/local_wheels
+        python -m pip wheel --no-deps packages/gcp-sphinx-docfx-yaml -w /tmp/local_wheels
+        WHEEL_PATH=$(ls /tmp/local_wheels/gcp_sphinx_docfx_yaml-*.whl)
+        echo "Built local wheel: ${WHEEL_PATH}"
+        echo "gcp-sphinx-docfx-yaml @ file://${WHEEL_PATH}" > /tmp/uv_overrides.txt
+        echo "UV_OVERRIDE=/tmp/uv_overrides.txt" >> $GITHUB_ENV
+        echo "UV_FIND_LINKS=/tmp/local_wheels" >> $GITHUB_ENV
+        echo "PIP_FIND_LINKS=/tmp/local_wheels" >> $GITHUB_ENV
+    - name: Run docfx for ${{ matrix.package_shard.description }}
       env:
         BUILD_TYPE: presubmit
         TARGET_BRANCH: ${{ github.base_ref || github.event.merge_group.base_ref || github.ref_name }}
         TEST_TYPE: docfx
+        PACKAGE_LIST: ${{ matrix.package_shard.packages }}
         # TODO(https://github.com/googleapis/google-cloud-python/issues/13775): Specify `PY_VERSION` rather than relying on the default python version of the nox session.
         PY_VERSION: "unused"
       run: |
         ci/run_conditional_tests.sh
+
+  docfx:
+    if: always()
+    needs: [initialize, docfx-shard]
+    runs-on: ubuntu-latest
+    name: docfx
+    steps:
+    - name: Check docfx job status
+      run: |
+        if [[ "${{ needs.initialize.result }}" != "success" ]]; then
+          echo "Error: The initialize job status was: ${{ needs.initialize.result }}"
+          exit 1
+        fi
+        if [[ "${{ needs['docfx-shard'].result }}" != "success" && "${{ needs['docfx-shard'].result }}" != "skipped" ]]; then
+          echo "docfx failed with result: ${{ needs['docfx-shard'].result }}"
+          exit 1
+        fi
+        echo "All docfx shards passed or were skipped!"

From fc90c8ca49f51e89efc0d72a4b566d302805d73b Mon Sep 17 00:00:00 2001
From: Daniel Sanche <d.sanche14@gmail.com>
Date: Tue, 6 Oct 2026 17:26:49 -0700
Subject: [PATCH 2/2] remove branch filter

---
 .github/workflows/docs.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 142e8b34f1a4..b0ef84408c9d 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -3,9 +3,6 @@ on:
     branches:
       - main
   pull_request:
-    branches:
-      - main
-      - preview
   # Trigger workflow on GitHub merge queue events
   # See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#merge_group
   merge_group: