Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: avoid timeout due to long blake3 build from source #2436

Merged
merged 6 commits into from
Sep 27, 2024
Merged

fix: avoid timeout due to long blake3 build from source #2436

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f67c209
Fix timeout due to long blake3 build from source
ddelange Sep 23, 2024
3a987c3
Simplify
ddelange Sep 23, 2024
f50c599
Remove QEMU
ddelange Sep 26, 2024
0960fc0
Fix -latest remnant
ddelange Sep 26, 2024
ef10f48
Fix typo
ddelange Sep 26, 2024
e045a9d
Bring back QEMU
ddelange Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions .github/workflows/wheel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ concurrency:

jobs:
build_wheels_matrix:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
Copy link
Contributor Author

@ddelange ddelange Sep 26, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pinning OS versions in wheel.yml hoping to get less unexpected failues in CI (due to edits to the runner image like we saw when they changed the default xcode version)

outputs:
include: ${{ steps.set-matrix.outputs.include }}

Expand All @@ -48,10 +48,10 @@ jobs:
run: |
MATRIX_INCLUDE=$(
{
cibuildwheel --print-build-identifiers --platform linux --arch x86_64,aarch64 | jq -nRc '{"only": inputs, "os": "ubuntu-latest"}' \
cibuildwheel --print-build-identifiers --platform linux --arch x86_64,aarch64 | jq -nRc '{"only": inputs, "os": "ubuntu-22.04"}' \
&& cibuildwheel --print-build-identifiers --platform macos --arch x86_64 | jq -nRc '{"only": inputs, "os": "macos-13"}' \
&& cibuildwheel --print-build-identifiers --platform macos --arch arm64 | jq -nRc '{"only": inputs, "os": "macos-14"}' \
&& cibuildwheel --print-build-identifiers --platform windows --arch AMD64 | jq -nRc '{"only": inputs, "os": "windows-latest"}'
&& cibuildwheel --print-build-identifiers --platform windows --arch AMD64 | jq -nRc '{"only": inputs, "os": "windows-2022"}'
} | jq -sc
)
echo "include=$MATRIX_INCLUDE" >> $GITHUB_OUTPUT
Expand All @@ -78,11 +78,11 @@ jobs:
submodules: true

- name: Copy dll
if: matrix.os == 'windows-latest'
if: startswith(matrix.os, 'windows')
uses: ./ci/actions/windll

- name: chores
if: matrix.os != 'windows-latest'
if: ${{ !startswith(matrix.os, 'windows') }}
run: |
mkdir packages/vaex-core/bin
cp bin/install_pcre.sh packages/vaex-core/bin/
Expand All @@ -105,9 +105,8 @@ jobs:
env:
CIBW_BEFORE_BUILD: ${{ startswith(matrix.os, 'ubuntu') && 'bash bin/install_pcre.sh' || startswith(matrix.os, 'macos') && 'sudo -E bash bin/install_pcre.sh' || '' }}
CIBW_BUILD_VERBOSITY: 2
# cargo needed because of missing blake3 wheels (aarch64 and musllinux missing)
# cargo added to path in CIBW_ENVIRONMENT_LINUX below
CIBW_BEFORE_TEST: ${{ startswith(matrix.os, 'ubuntu') && 'curl https://sh.rustup.rs -sSf | sh -s -- -y' || '' }}
# temporary ref https:/oconnor663/blake3-py/pull/45
CIBW_BEFORE_TEST: pip install --force-reinstall blake3 --find-links https:/ddelange/blake3-py/releases/expanded_assets/0.4.1
# no test on musllinux due to missing pyarrow wheels ref https:/apache/arrow/pull/40177
CIBW_TEST_SKIP: '*musllinux*'
CIBW_TEST_COMMAND: python -c "import vaex; print(vaex.from_arrays(x=[1,2]))"
Expand Down
Loading