Skip to content

Commit

Permalink
Remove CMake downgrade workaround from Windows CI tests (#19630)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
acozzette authored Dec 12, 2024
1 parent d7d3da6 commit 3a7bb4a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/test_bazel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,11 @@ jobs:
# Not running Bazel 6 with bzlmod, because it doesn't support use_repo_rule in rules_jvm_external
bzlmod: false
- runner: ubuntu
bazelversion: '7.1.2'
bzlmod: false
toolchain_resolution: --incompatible_enable_proto_toolchain_resolution=true
- runner: ubuntu
bazelversion: '7.1.2'
bzlmod: true
toolchain_resolution: --incompatible_enable_proto_toolchain_resolution=true
runs-on: ${{ matrix.runner }}-latest
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/test_cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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) }}
Expand Down

0 comments on commit 3a7bb4a

Please sign in to comment.