Skip to content

Commit 3a7bb4a

Browse files
author
Adam Cozzette
authored
Remove CMake downgrade workaround from Windows CI tests (#19630)
This should fix some Windows tests that are failing to install a downgraded CMake version. I also fixed some of the Bazel examples tests. Two of the test runs seemed to be omitting a Bazel version and were inadvertently using Bazel 8.
1 parent d7d3da6 commit 3a7bb4a

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

.github/workflows/test_bazel.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,11 @@ jobs:
3636
# Not running Bazel 6 with bzlmod, because it doesn't support use_repo_rule in rules_jvm_external
3737
bzlmod: false
3838
- runner: ubuntu
39+
bazelversion: '7.1.2'
3940
bzlmod: false
4041
toolchain_resolution: --incompatible_enable_proto_toolchain_resolution=true
4142
- runner: ubuntu
43+
bazelversion: '7.1.2'
4244
bzlmod: true
4345
toolchain_resolution: --incompatible_enable_proto_toolchain_resolution=true
4446
runs-on: ${{ matrix.runner }}-latest

.github/workflows/test_cpp.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -470,12 +470,6 @@ jobs:
470470
arch: ${{ matrix.windows-arch || 'x64' }}
471471
vsversion: ${{ matrix.vsversion }}
472472

473-
# Workaround for Abseil incompatibility with CMake 3.30 (b/352354235).
474-
- name: Downgrade CMake
475-
if: ${{ runner.os == 'Windows' && (!matrix.continuous-only || inputs.continuous-run)}}
476-
run: choco install cmake --version 3.29.6 --force
477-
shell: bash
478-
479473
# Workaround for incompatibility between gcloud and windows-2019 runners.
480474
- name: Install Python
481475
if: ${{ matrix.python-version && (!matrix.continuous-only || inputs.continuous-run) }}

0 commit comments

Comments
 (0)