Skip to content

Commit

Permalink
DNM: test wheel builds with Rust 1.70
Browse files Browse the repository at this point in the history
  • Loading branch information
jakelishman committed Apr 8, 2024
1 parent d994ce6 commit 1197e3a
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 68 deletions.
75 changes: 9 additions & 66 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
---
name: Wheel Builds
on:
push:
tags:
- '*'
pull_request:
branches: '*'

jobs:
build_wheels:
name: Build wheels
runs-on: ${{ matrix.os }}
environment: release
strategy:
fail-fast: false
matrix:
Expand All @@ -19,7 +18,7 @@ jobs:
name: Install Python
with:
python-version: '3.10'
- uses: dtolnay/rust-toolchain@stable
- uses: dtolnay/rust-toolchain@1.70
with:
components: llvm-tools-preview
- name: Build wheels
Expand Down Expand Up @@ -47,7 +46,7 @@ jobs:
name: Install Python
with:
python-version: '3.10'
- uses: dtolnay/rust-toolchain@stable
- uses: dtolnay/rust-toolchain@1.70
with:
components: llvm-tools-preview
- name: Build wheels
Expand All @@ -61,7 +60,6 @@ jobs:
build_wheels_macos_arm:
name: Build wheels on macOS arm
runs-on: ${{ matrix.os }}
environment: release
strategy:
fail-fast: false
matrix:
Expand All @@ -72,7 +70,7 @@ jobs:
name: Install Python
with:
python-version: '3.10'
- uses: dtolnay/rust-toolchain@stable
- uses: dtolnay/rust-toolchain@1.70
- name: Build wheels
uses: pypa/[email protected]
env:
Expand All @@ -85,27 +83,9 @@ jobs:
with:
path: ./wheelhouse/*.whl
name: wheels-${{ matrix.os }}-arm
upload_shared_wheels:
name: Upload shared build wheels
runs-on: ubuntu-latest
environment: release
permissions:
id-token: write
needs: ["build_wheels", "build_wheels_macos_arm", "build_wheels_32bit"]
steps:
- uses: actions/download-artifact@v4
with:
pattern: 'wheels-*'
merge-multiple: true
path: deploy
- name: Publish package distributions to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
with:
packages-dir: deploy
build_wheels_s390x:
name: Build wheels on s390x
runs-on: ${{ matrix.os }}
environment: release
permissions:
id-token: write
strategy:
Expand All @@ -118,7 +98,7 @@ jobs:
name: Install Python
with:
python-version: '3.10'
- uses: dtolnay/rust-toolchain@stable
- uses: dtolnay/rust-toolchain@1.70
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
with:
Expand All @@ -132,14 +112,9 @@ jobs:
with:
name: wheels-${{ matrix.os }}-s390x
path: ./wheelhouse/*.whl
- name: Publish package distributions to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
with:
packages-dir: wheelhouse/
build_wheels_ppc64le:
name: Build wheels on ppc64le
runs-on: ${{ matrix.os }}
environment: release
permissions:
id-token: write
strategy:
Expand All @@ -152,7 +127,7 @@ jobs:
name: Install Python
with:
python-version: '3.10'
- uses: dtolnay/rust-toolchain@stable
- uses: dtolnay/rust-toolchain@1.70
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
with:
Expand All @@ -166,14 +141,9 @@ jobs:
with:
name: wheels-${{ matrix.os }}-ppc64le
path: ./wheelhouse/*.whl
- name: Publish package distributions to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
with:
packages-dir: wheelhouse/
build_wheels_aarch64:
name: Build wheels on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
environment: release
permissions:
id-token: write
strategy:
Expand All @@ -186,7 +156,7 @@ jobs:
name: Install Python
with:
python-version: '3.10'
- uses: dtolnay/rust-toolchain@stable
- uses: dtolnay/rust-toolchain@1.70
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
with:
Expand All @@ -199,30 +169,3 @@ jobs:
with:
name: wheels-${{ matrix.os }}-aarch64
path: ./wheelhouse/*.whl
- name: Publish package distributions to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
with:
packages-dir: wheelhouse/
sdist:
name: Build and publish sdist
runs-on: ${{ matrix.os }}
needs: ["upload_shared_wheels"]
environment: release
permissions:
id-token: write
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest]
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
name: Install Python
with:
python-version: '3.10'
- name: Install deps
run: pip install -U build
- name: Build sdist
run: python -m build . --sdist
- name: Publish package distributions to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -148,11 +148,11 @@ before-test = "pip install --only-binary=numpy,scipy numpy scipy"
# specific job override is needed. For example tier 1 platforms locally override
# the before-build and environment configuration to enable PGO,
# see: .github/workflows/wheels.yml for the jobs where this is done
environment = 'RUSTUP_TOOLCHAIN="stable"'
environment = 'RUSTUP_TOOLCHAIN="1.70"'

[tool.cibuildwheel.linux]
before-all = "yum install -y wget && {package}/tools/install_rust.sh"
environment = 'PATH="$PATH:$HOME/.cargo/bin" CARGO_NET_GIT_FETCH_WITH_CLI="true" RUSTUP_TOOLCHAIN="stable"'
environment = 'PATH="$PATH:$HOME/.cargo/bin" CARGO_NET_GIT_FETCH_WITH_CLI="true" RUSTUP_TOOLCHAIN="1.70"'
repair-wheel-command = "auditwheel repair -w {dest_dir} {wheel} && pipx run abi3audit --strict --report {wheel}"

[tool.cibuildwheel.macos]
Expand Down

0 comments on commit 1197e3a

Please sign in to comment.