From 9668cbd6df9e22f0c0bcfcee5d3a176d30e01003 Mon Sep 17 00:00:00 2001
From: Adam Cozzette <acozzette@google.com>
Date: Thu, 12 Dec 2024 18:19:10 +0000
Subject: [PATCH] Remove CMake downgrade workaround from Windows CI tests

---
 .github/workflows/test_bazel.yml | 2 +-
 .github/workflows/test_cpp.yml   | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/.github/workflows/test_bazel.yml b/.github/workflows/test_bazel.yml
index ef273306b61b0..63c6a4b75c1cf 100644
--- a/.github/workflows/test_bazel.yml
+++ b/.github/workflows/test_bazel.yml
@@ -69,4 +69,4 @@ jobs:
           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 //... $BAZEL_FLAGS --enable_bzlmod=${{ matrix.bzlmod }} --enable_workspace=${{ !matrix.bzlmod }} ${{ matrix.toolchain_resolution }}
diff --git a/.github/workflows/test_cpp.yml b/.github/workflows/test_cpp.yml
index 33a7ed7108a44..fb18a521d50f2 100644
--- a/.github/workflows/test_cpp.yml
+++ b/.github/workflows/test_cpp.yml
@@ -470,12 +470,6 @@ jobs:
           arch: ${{ matrix.windows-arch || 'x64' }}
           vsversion: ${{ matrix.vsversion }}
 
-      # Workaround for Abseil incompatibility with CMake 3.30 (b/352354235).
-      - name: Downgrade CMake
-        if: ${{ runner.os == 'Windows' && (!matrix.continuous-only || inputs.continuous-run)}}
-        run: choco install cmake --version 3.29.6 --force
-        shell: bash
-
       # Workaround for incompatibility between gcloud and windows-2019 runners.
       - name: Install Python
         if: ${{ matrix.python-version && (!matrix.continuous-only || inputs.continuous-run) }}