Both work, get the rest working

astral-sh · Mar 14, 2024 · 33a58b3 · 33a58b3
1 parent cbce36b
commit 33a58b3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml
@@ -39,18 +39,17 @@ jobs:
     strategy:
       matrix:
         platform:
-#          - target: aarch64-unknown-linux-gnu
-#            arch: aarch64
-#            # see https://github.com/astral-sh/ruff/issues/3791
-#            # and https://github.com/gnzlbg/jemallocator/issues/170#issuecomment-1503228963
-#            maturin_docker_options: -e JEMALLOC_SYS_WITH_LG_PAGE=16
-#          - target: armv7-unknown-linux-gnueabihf
-#            arch: armv7
+          - target: aarch64-unknown-linux-gnu
+            arch: aarch64
+            # see https://github.com/astral-sh/ruff/issues/3791
+            # and https://github.com/gnzlbg/jemallocator/issues/170#issuecomment-1503228963
+            maturin_docker_options: -e JEMALLOC_SYS_WITH_LG_PAGE=16
+          - target: armv7-unknown-linux-gnueabihf
+            arch: armv7
           - target: armv7-unknown-linux-musleabihf
             arch: armv7
           - target: arm-unknown-linux-musleabihf
             arch: arm
-#            maturin_docker_options: -e CC=gcc-arm-linux-gnu
 
     steps:
       - uses: actions/checkout@v4
@@ -63,7 +62,8 @@ jobs:
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.platform.target }}
-          manylinux: auto
+          # On `aarch64`, use `manylinux: 2_28`; otherwise, use `manylinux: auto`.
+          manylinux: ${{ matrix.platform.arch == 'aarch64' && '2_28' || 'auto' }}
           docker-options: ${{ matrix.platform.maturin_docker_options }}
           args: --release --locked --out dist --no-default-features --features flate2/rust_backend
       - uses: uraimo/run-on-arch-action@v2
@@ -80,6 +80,8 @@ jobs:
             pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
             ${{ env.MODULE_NAME }} --help
       - name: "Upload wheels"
+        # Skip for `arm`, which is not supported by PyPI.
+        if: ${{ matrix.platform.arch != 'arm' }}
         uses: actions/upload-artifact@v4
         with:
           name: wheels-${{ matrix.platform.target }}

diff --git a/Cargo.toml b/Cargo.toml
@@ -172,7 +172,7 @@ windows-archive = ".zip"
 # The archive format to use for non-windows builds (defaults .tar.xz)
 unix-archive = ".tar.gz"
 # Target platforms to build apps for (Rust target-triple syntax)
-targets = ["aarch64-unknown-linux-gnu", "x86_64-unknown-linux-gnu", "i686-unknown-linux-gnu", "aarch64-apple-darwin", "x86_64-apple-darwin", "aarch64-unknown-linux-musl", "x86_64-unknown-linux-musl", "i686-unknown-linux-musl", "x86_64-pc-windows-msvc", "i686-pc-windows-msvc", "armv7-unknown-linux-gnueabihf", "powerpc64-unknown-linux-gnu", "powerpc64le-unknown-linux-gnu", "s390x-unknown-linux-gnu"]
+targets = ["aarch64-unknown-linux-gnu", "x86_64-unknown-linux-gnu", "i686-unknown-linux-gnu", "aarch64-apple-darwin", "x86_64-apple-darwin", "aarch64-unknown-linux-musl", "x86_64-unknown-linux-musl", "i686-unknown-linux-musl", "x86_64-pc-windows-msvc", "i686-pc-windows-msvc", "armv7-unknown-linux-gnueabihf", "powerpc64-unknown-linux-gnu", "powerpc64le-unknown-linux-gnu", "s390x-unknown-linux-gnu", "armv7-unknown-linux-musleabihf", "arm-unknown-linux-musleabihf"]
 # Whether to auto-include files like READMEs and CHANGELOGs (default true)
 auto-includes = false
 # Whether cargo-dist should create a Github Release or use an existing draft