diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 91c3d84..071bb5d 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] 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,22 +34,10 @@ 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 target: x86_64-pc-windows-msvc - - build: windows-latest - os: windows-latest - rust: stable-x86_64 - target: x86_64-pc-windows-msvc steps: - uses: actions/checkout@master - run: git submodule init @@ -67,12 +51,17 @@ jobs: run: pip install matplotlib - name: Install Matplotlib (Anaconda) if: startsWith(matrix.build, 'anaconda') - run: $CONDA/bin/conda install conda-forge::matplotlib + run: | + source $($CONDA/bin/conda info --base)/bin/activate native + export DYLD_LIBRARY_PATH=$CONDA_PREFIX/lib + $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 --no-self-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 @@ -85,7 +74,4 @@ jobs: cargo run --example a_simple_example - name: Run example with Anaconda on MacOS if: startsWith(matrix.build, 'anaconda macos') - run: | - source $($CONDA/bin/conda info --base)/bin/activate - export DYLD_LIBRARY_PATH=$CONDA_PREFIX/lib - cargo run --example a_simple_example + run: cargo run --example a_simple_example -vv