From b48db77fb0b0563a65f898a7fc2b4ad159f49a2d Mon Sep 17 00:00:00 2001 From: Kyle Barron Date: Fri, 6 Dec 2024 00:10:54 -0500 Subject: [PATCH] Fix wheel build --- .github/workflows/python-core-wheels.yml | 14 +++++++++----- .github/workflows/python-io-wheels.yml | 17 +++++++++++------ 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/.github/workflows/python-core-wheels.yml b/.github/workflows/python-core-wheels.yml index daf7696d..a4990544 100644 --- a/.github/workflows/python-core-wheels.yml +++ b/.github/workflows/python-core-wheels.yml @@ -46,8 +46,9 @@ jobs: - name: Build wheels uses: PyO3/maturin-action@v1 with: + rust-toolchain: nightly target: ${{ matrix.platform.target }} - args: --release --out dist --find-interpreter --manifest-path python/${{ matrix.module }}/Cargo.toml + args: RUSTFLAGS="-Zinline-mir=no" --release --out dist --find-interpreter --manifest-path python/${{ matrix.module }}/Cargo.toml sccache: "true" manylinux: auto - name: Upload wheels @@ -82,7 +83,7 @@ jobs: # uses: PyO3/maturin-action@v1 # with: # target: ${{ matrix.platform.target }} - # args: --release --out dist --find-interpreter --manifest-path python/${{ matrix.module }}/Cargo.toml + # args: RUSTFLAGS="-Zinline-mir=no" --release --out dist --find-interpreter --manifest-path python/${{ matrix.module }}/Cargo.toml # sccache: "true" # manylinux: musllinux_1_2 # - name: Upload wheels @@ -112,8 +113,9 @@ jobs: - name: Build wheels uses: PyO3/maturin-action@v1 with: + rust-toolchain: nightly target: ${{ matrix.platform.target }} - args: --release --out dist --find-interpreter --manifest-path python/${{ matrix.module }}/Cargo.toml + args: RUSTFLAGS="-Zinline-mir=no" --release --out dist --find-interpreter --manifest-path python/${{ matrix.module }}/Cargo.toml sccache: "true" - name: Upload wheels uses: actions/upload-artifact@v4 @@ -142,8 +144,9 @@ jobs: - name: Build wheels uses: PyO3/maturin-action@v1 with: + rust-toolchain: nightly target: ${{ matrix.platform.target }} - args: --release --out dist --find-interpreter --manifest-path python/${{ matrix.module }}/Cargo.toml + args: RUSTFLAGS="-Zinline-mir=no" --release --out dist --find-interpreter --manifest-path python/${{ matrix.module }}/Cargo.toml sccache: "true" - name: Upload wheels uses: actions/upload-artifact@v4 @@ -183,8 +186,9 @@ jobs: - name: Build wheels uses: PyO3/maturin-action@v1 with: + rust-toolchain: nightly target: ${{ matrix.platform.target }} - args: --release --out dist --find-interpreter --no-default-features --manifest-path python/${{ matrix.module }}/Cargo.toml + args: RUSTFLAGS="-Zinline-mir=no" --release --out dist --find-interpreter --no-default-features --manifest-path python/${{ matrix.module }}/Cargo.toml sccache: "true" rust-toolchain: nightly - name: Upload wheels diff --git a/.github/workflows/python-io-wheels.yml b/.github/workflows/python-io-wheels.yml index 890e3545..ccb44464 100644 --- a/.github/workflows/python-io-wheels.yml +++ b/.github/workflows/python-io-wheels.yml @@ -26,9 +26,10 @@ jobs: - name: Build wheels uses: PyO3/maturin-action@v1 with: + rust-toolchain: nightly target: ${{ matrix.target }} manylinux: manylinux_2_28 - args: --release --out dist --find-interpreter -m python/geoarrow-io/Cargo.toml + args: RUSTFLAGS="-Zinline-mir=no" --release --out dist --find-interpreter -m python/geoarrow-io/Cargo.toml before-script-linux: | yum update -y yum install openssl openssl-devel perl-IPC-Cmd -y @@ -59,9 +60,10 @@ jobs: # - name: Build wheels # uses: PyO3/maturin-action@v1 # with: + # rust-toolchain: nightly # target: ${{ matrix.target }} # manylinux: auto - # args: --release --out dist --find-interpreter -m python/geoarrow-io/Cargo.toml + # args: RUSTFLAGS="-Zinline-mir=no" --release --out dist --find-interpreter -m python/geoarrow-io/Cargo.toml # # This is currently failing with # # python: command not found @@ -112,7 +114,7 @@ jobs: uses: PyO3/maturin-action@v1 with: target: ${{ matrix.platform.target }} - args: --release --out dist --find-interpreter -m python/geoarrow-io/Cargo.toml + args: RUSTFLAGS="-Zinline-mir=no" --release --out dist --find-interpreter -m python/geoarrow-io/Cargo.toml sccache: "true" - name: Install built wheel - ${{ matrix.platform.target }} @@ -144,8 +146,9 @@ jobs: - name: Build wheels uses: PyO3/maturin-action@v1 with: + rust-toolchain: nightly target: ${{ matrix.target }} - args: --release --out dist --find-interpreter -m python/geoarrow-io/Cargo.toml + args: RUSTFLAGS="-Zinline-mir=no" --release --out dist --find-interpreter -m python/geoarrow-io/Cargo.toml - name: Install built wheel run: | @@ -178,9 +181,10 @@ jobs: # - name: Build wheels # uses: PyO3/maturin-action@v1 # with: + # rust-toolchain: nightly # target: ${{ matrix.target }} # manylinux: musllinux_1_2 - # args: --release --out dist --find-interpreter -m python/geoarrow-io/Cargo.toml + # args: RUSTFLAGS="-Zinline-mir=no" --release --out dist --find-interpreter -m python/geoarrow-io/Cargo.toml # - name: Install built wheel # if: matrix.target == 'x86_64-unknown-linux-musl' @@ -220,9 +224,10 @@ jobs: # - name: Build wheels # uses: PyO3/maturin-action@v1 # with: + # rust-toolchain: nightly # target: ${{ matrix.platform.target }} # manylinux: musllinux_1_2 - # args: --release --out dist --find-interpreter -m python/geoarrow-io/Cargo.toml + # args: RUSTFLAGS="-Zinline-mir=no" --release --out dist --find-interpreter -m python/geoarrow-io/Cargo.toml # - uses: uraimo/run-on-arch-action@v2.5.1 # name: Install built wheel