From f67c20976dd5cdd40011e0807c6eee745d6f8521 Mon Sep 17 00:00:00 2001 From: ddelange <14880945+ddelange@users.noreply.github.com> Date: Mon, 23 Sep 2024 10:27:22 +0200 Subject: [PATCH 1/6] Fix timeout due to long blake3 build from source --- .github/workflows/wheel.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/wheel.yml b/.github/workflows/wheel.yml index 07f43ad00..9ee7fb5b6 100644 --- a/.github/workflows/wheel.yml +++ b/.github/workflows/wheel.yml @@ -108,6 +108,8 @@ jobs: # 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' || '' }} + # if this works, cargo ^ can be removed again ref https://github.com/oconnor663/blake3-py/pull/45 + PIP_FIND_LINKS: https://github.com/ddelange/blake3-py/releases/expanded_assets/0.4.1 # no test on musllinux due to missing pyarrow wheels ref https://github.com/apache/arrow/pull/40177 CIBW_TEST_SKIP: '*musllinux*' CIBW_TEST_COMMAND: python -c "import vaex; print(vaex.from_arrays(x=[1,2]))" From 3a987c360e4fb4f1eedba01dcae7b5befceb70f4 Mon Sep 17 00:00:00 2001 From: ddelange <14880945+ddelange@users.noreply.github.com> Date: Mon, 23 Sep 2024 10:29:11 +0200 Subject: [PATCH 2/6] Simplify --- .github/workflows/wheel.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/wheel.yml b/.github/workflows/wheel.yml index 9ee7fb5b6..c97a6ebe3 100644 --- a/.github/workflows/wheel.yml +++ b/.github/workflows/wheel.yml @@ -105,11 +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' || '' }} - # if this works, cargo ^ can be removed again ref https://github.com/oconnor663/blake3-py/pull/45 - PIP_FIND_LINKS: https://github.com/ddelange/blake3-py/releases/expanded_assets/0.4.1 + # temporary ref https://github.com/oconnor663/blake3-py/pull/45 + CIBW_BEFORE_TEST: pip install --force-reinstall blake3 --find-links https://github.com/ddelange/blake3-py/releases/expanded_assets/0.4.1 # no test on musllinux due to missing pyarrow wheels ref https://github.com/apache/arrow/pull/40177 CIBW_TEST_SKIP: '*musllinux*' CIBW_TEST_COMMAND: python -c "import vaex; print(vaex.from_arrays(x=[1,2]))" From f50c599f070507bdd8836c689a75f4f5f94a4f12 Mon Sep 17 00:00:00 2001 From: ddelange <14880945+ddelange@users.noreply.github.com> Date: Thu, 26 Sep 2024 11:32:17 +0200 Subject: [PATCH 3/6] Remove QEMU --- .github/workflows/wheel.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/wheel.yml b/.github/workflows/wheel.yml index c97a6ebe3..a2fafad3e 100644 --- a/.github/workflows/wheel.yml +++ b/.github/workflows/wheel.yml @@ -48,10 +48,11 @@ 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 | jq -nRc '{"only": inputs, "os": "ubuntu-22.04"}' \ + && cibuildwheel --print-build-identifiers --platform linux --arch aarch64 | jq -nRc '{"only": inputs, "os": "ubuntu-22.04-arm64"}' \ && 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 @@ -87,10 +88,6 @@ jobs: mkdir packages/vaex-core/bin cp bin/install_pcre.sh packages/vaex-core/bin/ - - name: Set up QEMU - if: runner.os == 'Linux' - uses: docker/setup-qemu-action@v3 - # xcode 15.2 throws compilation errors ref https://github.com/vaexio/vaex/pull/2432 # select older xcode from the available versions on the runner ref https://github.com/actions/runner-images/blob/ff9acc6/images/macos/macos-13-Readme.md#xcode - name: Switch to older Xcode (Mac-only) From 0960fc02c9692d0693a18728681c290e39e15680 Mon Sep 17 00:00:00 2001 From: ddelange <14880945+ddelange@users.noreply.github.com> Date: Thu, 26 Sep 2024 11:54:08 +0200 Subject: [PATCH 4/6] Fix -latest remnant --- .github/workflows/wheel.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/wheel.yml b/.github/workflows/wheel.yml index a2fafad3e..96a4239b0 100644 --- a/.github/workflows/wheel.yml +++ b/.github/workflows/wheel.yml @@ -21,7 +21,7 @@ concurrency: jobs: build_wheels_matrix: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 outputs: include: ${{ steps.set-matrix.outputs.include }} @@ -79,11 +79,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: not startswith(matrix.os, 'windows') run: | mkdir packages/vaex-core/bin cp bin/install_pcre.sh packages/vaex-core/bin/ From ef10f48582544c3fb851f53741c3120d30536925 Mon Sep 17 00:00:00 2001 From: ddelange <14880945+ddelange@users.noreply.github.com> Date: Thu, 26 Sep 2024 11:55:36 +0200 Subject: [PATCH 5/6] Fix typo --- .github/workflows/wheel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheel.yml b/.github/workflows/wheel.yml index 96a4239b0..cd9974f7c 100644 --- a/.github/workflows/wheel.yml +++ b/.github/workflows/wheel.yml @@ -83,7 +83,7 @@ jobs: uses: ./ci/actions/windll - name: chores - if: not startswith(matrix.os, 'windows') + if: ${{ !startswith(matrix.os, 'windows') }} run: | mkdir packages/vaex-core/bin cp bin/install_pcre.sh packages/vaex-core/bin/ From e045a9da821ba9aecc53ac0a8d53e6b516c4038d Mon Sep 17 00:00:00 2001 From: ddelange <14880945+ddelange@users.noreply.github.com> Date: Thu, 26 Sep 2024 15:09:14 +0200 Subject: [PATCH 6/6] Bring back QEMU --- .github/workflows/wheel.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wheel.yml b/.github/workflows/wheel.yml index cd9974f7c..4d72198ff 100644 --- a/.github/workflows/wheel.yml +++ b/.github/workflows/wheel.yml @@ -48,8 +48,7 @@ jobs: run: | MATRIX_INCLUDE=$( { - cibuildwheel --print-build-identifiers --platform linux --arch x86_64 | jq -nRc '{"only": inputs, "os": "ubuntu-22.04"}' \ - && cibuildwheel --print-build-identifiers --platform linux --arch aarch64 | jq -nRc '{"only": inputs, "os": "ubuntu-22.04-arm64"}' \ + 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-2022"}' @@ -88,6 +87,10 @@ jobs: mkdir packages/vaex-core/bin cp bin/install_pcre.sh packages/vaex-core/bin/ + - name: Set up QEMU + if: runner.os == 'Linux' + uses: docker/setup-qemu-action@v3 + # xcode 15.2 throws compilation errors ref https://github.com/vaexio/vaex/pull/2432 # select older xcode from the available versions on the runner ref https://github.com/actions/runner-images/blob/ff9acc6/images/macos/macos-13-Readme.md#xcode - name: Switch to older Xcode (Mac-only)