From 17d20fe99c4649a210534be5d16dca39dbb0fea8 Mon Sep 17 00:00:00 2001
From: Christophe Troestler <Christophe.Troestler@umons.ac.be>
Date: Wed, 17 Apr 2024 22:52:19 +0200
Subject: [PATCH] Simplify and improve the CI

---
 .github/workflows/rust.yml | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 91c3d84..98a37f7 100644
--- 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, anaconda linux, macos, anaconda macos, win64, windows-latest, windows-aarch64]
         include:
           - build: stable
             os: ubuntu-latest
@@ -22,14 +22,10 @@ jobs:
             os: ubuntu-latest
             rust: nightly
             target: x86_64-unknown-linux-gnu
-          - build: linux32
-            os: ubuntu-latest
-            rust: stable
-            target: i686-unknown-linux-gnu
           - 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,14 +34,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
-            target: aarch64-pc-windows-msvc
           - build: win64
             os: windows-latest
             rust: stable
@@ -54,6 +42,10 @@ jobs:
             os: windows-latest
             rust: stable-x86_64
             target: x86_64-pc-windows-msvc
+          - build: windows-aarch64
+            os: windows-latest
+            rust: stable
+            target: aarch64-pc-windows-msvc
     steps:
     - uses: actions/checkout@master
     - run: git submodule init
@@ -69,10 +61,12 @@ jobs:
       if: startsWith(matrix.build, 'anaconda')
       run: $CONDA/bin/conda install conda-forge::matplotlib
     - name: Install Rust (rustup)
-      run: rustup update ${{ matrix.rust }} --no-self-update && rustup default ${{ matrix.rust }}
+      run: |
+        rustup update
+        rustup default ${{ matrix.rust }}-${{ matrix.target }}
       shell: bash
-    - run: rustup target add ${{ 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 +82,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