diff options
| author | Nicholas Junge <nicholas.junge@web.de> | 2023-07-31 11:51:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-31 10:51:37 +0100 |
| commit | 8f7b8dd9a3211e6043e742a383ccb35eb810829f (patch) | |
| tree | 0a74cc4dbf61c13108f4594a5108052a9fbbc459 | |
| parent | 27d64a2351b98d48dd5b18c75ff536982a4ce26a (diff) | |
| download | google-benchmark-8f7b8dd9a3211e6043e742a383ccb35eb810829f.tar.gz | |
Re-enable windows-latest tests for newer Bazel (#1641)
The Windows toolchain detection fix made it into Bazel 6.3.0, so the CI
should work again with the re-enabled `windows-latest` marker.
Require Bazel 6.3.0 in the Linux container setup in `cibuildwheel`.
| -rw-r--r-- | .github/install_bazel.sh | 2 | ||||
| -rw-r--r-- | .github/workflows/bazel.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/wheels.yml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.github/install_bazel.sh b/.github/install_bazel.sh index bb910d8..2b1f4e7 100644 --- a/.github/install_bazel.sh +++ b/.github/install_bazel.sh @@ -5,7 +5,7 @@ if ! bazel version; then fi echo "Installing wget and downloading $arch Bazel binary from GitHub releases." yum install -y wget - wget "https://github.com/bazelbuild/bazel/releases/download/6.0.0/bazel-6.0.0-linux-$arch" -O /usr/local/bin/bazel + wget "https://github.com/bazelbuild/bazel/releases/download/6.3.0/bazel-6.3.0-linux-$arch" -O /usr/local/bin/bazel chmod +x /usr/local/bin/bazel else # bazel is installed for the correct architecture diff --git a/.github/workflows/bazel.yml b/.github/workflows/bazel.yml index 53f6d3e..1cdc38c 100644 --- a/.github/workflows/bazel.yml +++ b/.github/workflows/bazel.yml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-latest, windows-2019] + os: [ubuntu-latest, macos-latest, windows-latest] bzlmod: [false, true] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 5d06272..1f73bff 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -46,7 +46,7 @@ jobs: platforms: all - name: Build wheels on ${{ matrix.os }} using cibuildwheel - uses: pypa/cibuildwheel@v2.12.0 + uses: pypa/cibuildwheel@v2.14.1 env: CIBW_BUILD: 'cp38-* cp39-* cp310-* cp311-*' CIBW_SKIP: "*-musllinux_*" |