Use aarch64-apple-ios for anaconda on MacOS

Chris00 · Apr 18, 2024 · 0b8cc30 · 0b8cc30
1 parent e7c70c9
commit 0b8cc30
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        build: [stable, beta, nightly, linux32, macos, aarch64-ios, win64, windows-latest]
+        build: [stable, beta, nightly, linux32, macos, win64, windows-latest]
         include:
           - build: stable
             os: ubuntu-latest
@@ -29,7 +29,7 @@ jobs:
           - build: anaconda linux
             os: ubuntu-latest
             rust: stable
-            target: i686-unknown-linux-gnu
+            target: x86_64-unknown-linux-gnu
           - build: macos
             os: macos-latest
             rust: stable
@@ -38,10 +38,6 @@ jobs:
             os: macos-latest
             rust: stable
             target: x86_64-apple-darwin
-          - build: aarch64-ios
-            os: macos-latest
-            rust: stable
-            target: aarch64-apple-ios
           - build: windows-aarch64
             os: windows-latest
             rust: stable
@@ -58,10 +54,15 @@ jobs:
     - uses: actions/checkout@master
     - run: git submodule init
     - run: git submodule update
+    - run: sudo apt install gcc-multilib
+      if: startsWith(matrix.os, 'ubuntu')
     - uses: actions/setup-python@v5
       with:
         python-version: '3.12'
-      if: ${{ ! startsWith(matrix.build, 'anaconda') }}
+      if: ${{ ! startsWith(matrix.build, 'anaconda') && ! startsWith(matrix.build, 'linux32') }}
+    - name: Install Python 32 bits
+      run: sudo apt install python3:i386 lib32z1
+      if: startsWith(matrix.build, 'linux32')
     - name: Install Matplotlib (pip)
       if: ${{ ! startsWith(matrix.build, 'anaconda') }}
       run: pip install matplotlib
@@ -71,8 +72,9 @@ jobs:
     - name: Install Rust (rustup)
       run: rustup update ${{ matrix.rust }} --no-self-update && rustup default ${{ matrix.rust }}
       shell: bash
-    - run: rustup target add ${{ matrix.target }}
+    - run: rustup default ${{ matrix.rust }}-${{ matrix.target }}
     - run: cargo build -vv
+      if: ${{ ! startsWith(matrix.build, 'anaconda') }}
     - run: cargo test
       if: ${{ ! startsWith(matrix.build, 'anaconda') }}
     - run: cargo run --example a_simple_example
@@ -88,4 +90,4 @@ jobs:
       run: |
         source $($CONDA/bin/conda info --base)/bin/activate
         export DYLD_LIBRARY_PATH=$CONDA_PREFIX/lib
-        cargo run --example a_simple_example
+        cargo run --example a_simple_example -vv