Merge pull request #213 from messense/cargo-zigbuild

Test cross compiling with cargo-zigbuild

Author: messense

.github/workflows/ci.yml

@@ -94,7 +94,7 @@ jobs:
         run: rustup target add aarch64-apple-darwin
 
       - name: Install test dependencies
-        run: pip install --upgrade tox setuptools
+        run: pip install --upgrade tox
 
       - name: Install wheel (workaround python 3.10 CI issue)
         if: matrix.python-version == '3.10-dev'
@@ -170,7 +170,7 @@ jobs:
         run: |
           cd examples/rust_with_cffi/
           python --version
-          pip install -U pip wheel setuptools
+          pip install -U wheel
           python setup.py bdist_wheel --py-limited-api=cp39
           ls -la dist/
         env:
@@ -188,7 +188,7 @@ jobs:
         shell: bash
         run: |
           cd examples/
-          pip install -U pip wheel setuptools
+          pip install -U wheel
           python --version
           pip install rust_with_cffi/dist/rust_with_cffi*.whl
           python -c "from rust_with_cffi import rust; assert rust.rust_func() == 14"
@@ -268,7 +268,56 @@ jobs:
           python -m pip install wheel
           python setup.py bdist_wheel --plat-name manylinux2014_aarch64
           ls -la dist/
-      - uses: uraimo/[email protected]
+      - uses: uraimo/[email protected]
+        name: Install built wheel
+        with:
+          arch: aarch64
+          distro: ubuntu20.04
+          dockerRunArgs: |
+            --volume "${PWD}/examples/namespace_package:/io"
+          install: |
+            apt-get update
+            apt-get install -y --no-install-recommends python3 python3-pip
+            pip3 install -U pip
+          run: |
+            pip3 install namespace_package --no-index --find-links /io/dist/ --force-reinstall
+            python3 -c "from namespace_package import rust; assert rust.rust_func() == 14"
+            python3 -c "from namespace_package import python; assert python.python_func() == 15"
+
+  test-zigbuild:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: Setup python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.8
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          target: aarch64-unknown-linux-gnu
+          override: true
+      - name: Install cargo-zigbuild
+        run: |
+          cargo install cargo-zigbuild
+          python3 -m pip install ziglang
+      - name: Build package
+        run: pip install -e .
+      - name: Build wheel using cargo-zigbuild
+        shell: bash
+        env:
+          CARGO: cargo-zigbuild
+          CARGO_BUILD_TARGET: aarch64-unknown-linux-gnu
+          PYO3_CROSS_LIB_DIR: /opt/python/cp38-cp38/lib
+        run: |
+          mkdir -p $PYO3_CROSS_LIB_DIR
+          docker cp -L $(docker create --rm quay.io/pypa/manylinux2014_aarch64:latest):/opt/python/cp38-cp38 /opt/python
+          cd examples/namespace_package
+          python -m pip install wheel
+          python setup.py bdist_wheel --plat-name manylinux2014_aarch64
+          ls -la dist/
+      - uses: uraimo/[email protected]
         name: Install built wheel
         with:
           arch: aarch64

README.md

@@ -79,7 +79,8 @@ Finished processing dependencies for hello_rust==1.0
 
 Or you can use commands like `bdist_wheel` (after installing `wheel`). See also [the notes in the documentation about building wheels](https://setuptools-rust.readthedocs.io/en/latest/building_wheels.html).
 
-Cross-compiling is also supported, using either [`crossenv`](https://github.com/benfogle/crossenv) or [`cross`](https://github.com/rust-embedded/cross). For examples see the `test-cross-compile` and `test-cross` Github actions jobs in [`ci.yml`](https://github.com/PyO3/setuptools-rust/blob/main/.github/workflows/ci.yml).
+Cross-compiling is also supported, using one of [`crossenv`](https://github.com/benfogle/crossenv), [`cross`](https://github.com/rust-embedded/cross) or [`cargo-zigbuild`](https://github.com/messense/cargo-zigbuild).
+For examples see the `test-cross-compile` and `test-cross` and `test-zigbuild` Github actions jobs in [`ci.yml`](https://github.com/PyO3/setuptools-rust/blob/main/.github/workflows/ci.yml).
 
 By default, `develop` will create a debug build, while `install` will create a release build.
 

examples/namespace_package/Dockerfile

@@ -1,13 +1,10 @@
 FROM quay.io/pypa/manylinux2014_aarch64 AS manylinux
 
-FROM rustembedded/cross:aarch64-unknown-linux-gnu
-
-RUN apt-get update && \
-    apt-get install -y software-properties-common && \
-    add-apt-repository ppa:deadsnakes/ppa && \
-    apt-get update && \
-    apt-get install -y python3.8 && \
-    update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 1
+FROM ghcr.io/cross-rs/aarch64-unknown-linux-gnu:edge
+
+RUN curl -L https://github.com/indygreg/python-build-standalone/releases/download/20220318/cpython-3.8.13+20220318-x86_64-unknown-linux-gnu-install_only.tar.gz | tar -xz -C /usr/local
+
+ENV PATH=/usr/local/python/bin:$PATH
 
 COPY --from=manylinux /opt/_internal /opt/_internal
 COPY --from=manylinux /opt/python /opt/python