Add an i686 cross compile job

PyO3 · Oct 19, 2022 · 3effa21 · 3effa21
1 parent 32def22
commit 3effa21
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -315,6 +315,10 @@ jobs:
             abi: cp310-cp310
             python: python3.10
             container: messense/manylinux2014-cross:s390x
+          - target: i686-unknown-linux-gnu
+            abi: cp310-cp310
+            python: python3.10
+            container: quay.io/pypa/manylinux2014_i686
           # PyPy
           - target: aarch64-unknown-linux-gnu
             abi: pp37-pypy37_pp73
@@ -325,27 +329,26 @@ jobs:
             python: pypy3.8
             container: messense/manylinux2014-cross:aarch64
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
-        id: rustup
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-          target: ${{ matrix.platform.target }}
+      - uses: actions/checkout@v1
       - name: Build wheels
         run: |
           set -ex
+          unset CARGO_BUILD_TARGET
+        
+          curl -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain stable --profile minimal
+          export PATH=$PATH:$HOME/.cargo/bin:/root/.cargo/bin
+          rustup target add ${{ matrix.platform.target }}
+
           # Use bundled sysconfig
-          cargo run --target x86_64-unknown-linux-gnu -- build -i ${{ matrix.platform.python }} --release --out dist --target ${{ matrix.platform.target }} -m test-crates/pyo3-mixed/Cargo.toml
+          cargo run build -i ${{ matrix.platform.python }} --release --out dist --target ${{ matrix.platform.target }} -m test-crates/pyo3-mixed/Cargo.toml
 
           # Use PYO3_CROSS_LIB_DIR
           export PYO3_CROSS_LIB_DIR=/opt/python/${{ matrix.platform.abi }}
-          cargo run --target x86_64-unknown-linux-gnu -- build -i python3.9 --release --out dist --target ${{ matrix.platform.target }} -m test-crates/pyo3-mixed/Cargo.toml
+          cargo run build -i python3.9 --release --out dist --target ${{ matrix.platform.target }} -m test-crates/pyo3-mixed/Cargo.toml
           unset PYO3_CROSS_LIB_DIR
 
           # Test abi3
-          cargo run --target x86_64-unknown-linux-gnu -- build -i ${{ matrix.platform.python }} --release --out dist --target ${{ matrix.platform.target }} -m test-crates/pyo3-pure/Cargo.toml
+          cargo run build -i ${{ matrix.platform.python }} --release --out dist --target ${{ matrix.platform.target }} -m test-crates/pyo3-pure/Cargo.toml
 
   test-bootstrap:
     name: Test Bootstrap