mirror of
https://github.com/google/benchmark.git
synced 2024-11-28 15:34:33 +00:00
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`.
This commit is contained in:
parent
27d64a2351
commit
8f7b8dd9a3
2
.github/install_bazel.sh
vendored
2
.github/install_bazel.sh
vendored
|
@ -5,7 +5,7 @@ if ! bazel version; then
|
||||||
fi
|
fi
|
||||||
echo "Installing wget and downloading $arch Bazel binary from GitHub releases."
|
echo "Installing wget and downloading $arch Bazel binary from GitHub releases."
|
||||||
yum install -y wget
|
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
|
chmod +x /usr/local/bin/bazel
|
||||||
else
|
else
|
||||||
# bazel is installed for the correct architecture
|
# bazel is installed for the correct architecture
|
||||||
|
|
2
.github/workflows/bazel.yml
vendored
2
.github/workflows/bazel.yml
vendored
|
@ -11,7 +11,7 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
os: [ubuntu-latest, macos-latest, windows-2019]
|
os: [ubuntu-latest, macos-latest, windows-latest]
|
||||||
bzlmod: [false, true]
|
bzlmod: [false, true]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
|
|
2
.github/workflows/wheels.yml
vendored
2
.github/workflows/wheels.yml
vendored
|
@ -46,7 +46,7 @@ jobs:
|
||||||
platforms: all
|
platforms: all
|
||||||
|
|
||||||
- name: Build wheels on ${{ matrix.os }} using cibuildwheel
|
- name: Build wheels on ${{ matrix.os }} using cibuildwheel
|
||||||
uses: pypa/cibuildwheel@v2.12.0
|
uses: pypa/cibuildwheel@v2.14.1
|
||||||
env:
|
env:
|
||||||
CIBW_BUILD: 'cp38-* cp39-* cp310-* cp311-*'
|
CIBW_BUILD: 'cp38-* cp39-* cp310-* cp311-*'
|
||||||
CIBW_SKIP: "*-musllinux_*"
|
CIBW_SKIP: "*-musllinux_*"
|
||||||
|
|
Loading…
Reference in a new issue