From 2981219509ad0403389f23f522a90c2a0421ac79 Mon Sep 17 00:00:00 2001
From: Scott Hart <sdhart@google.com>
Date: Mon, 19 Oct 2026 12:53:18 -0400
Subject: [PATCH] ci(gha): remove cmake downgrade and trust
 google-cloud-cpp-bot

---
 .github/workflows/test-runner.yml   | 5 +++--
 .github/workflows/windows-cmake.yml | 6 ------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test-runner.yml b/.github/workflows/test-runner.yml
index d087af854e001..4799fef572464 100644
--- a/.github/workflows/test-runner.yml
+++ b/.github/workflows/test-runner.yml
@@ -52,7 +52,8 @@ jobs:
       ${{
           (github.event_name != 'pull_request_target' && 'internal') ||
           (github.event.pull_request.head.repo.full_name == github.repository && 'internal') ||
-          (github.event.pull_request.head.repo.full_name == 'renovate-bot/google-cloud-cpp' && 'internal')
+          (github.event.pull_request.head.repo.full_name == 'renovate-bot/google-cloud-cpp' && 'internal') ||
+          (github.event.pull_request.head.repo.full_name == 'google-cloud-cpp-bot/google-cloud-cpp' && 'internal')
       }}
     name: Save PR ref
     runs-on: ubuntu-latest
@@ -92,7 +93,7 @@ jobs:
             esac
           elif [[ "${EVENT_NAME}" == "pull_request_target" ]]; then
             case "${USER_TO_CHECK}" in
-              renovate-bot|dependabot\[bot\]|release-please\[bot\]|gcf-merge-on-green\[bot\]|yoshi-code-bot|gcf-owl-bot\[bot\]|google-cloud-policy-bot\[bot\])
+              renovate-bot|google-cloud-cpp-bot|dependabot\[bot\]|release-please\[bot\]|gcf-merge-on-green\[bot\]|yoshi-code-bot|gcf-owl-bot\[bot\]|google-cloud-policy-bot\[bot\])
                 echo "Author '${USER_TO_CHECK}' is a trusted automation bot."
                 echo "is_trusted=true" >> "${GITHUB_OUTPUT}"
                 ;;
diff --git a/.github/workflows/windows-cmake.yml b/.github/workflows/windows-cmake.yml
index 364ffcc85b6df..d66e0b6f92eca 100644
--- a/.github/workflows/windows-cmake.yml
+++ b/.github/workflows/windows-cmake.yml
@@ -279,12 +279,6 @@ jobs:
     - name: Pre Build Disk Space
       shell: bash
       run: df -m
-    - name: Download and Install CMake
-      shell: bash
-      run: |
-        choco install -y --allow-downgrade cmake --version 3.31.6 || \
-        (sleep 60  ; choco install -y --allow-downgrade cmake --version 3.31.6) || \
-        (sleep 120 ; choco install -y --allow-downgrade cmake --version 3.31.6)
     - name: Download and Install sccache
       if: ${{ inputs.sccache-mode != 'DISABLED' }}
       working-directory: "${{runner.temp}}"