diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index ea36702..64c0e0a 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -45,19 +45,20 @@ jobs: python-version: '3.12' if: ${{ ! startsWith(matrix.build, 'anaconda') }} - name: Install Matplotlib (pip) - if: ${{ ! startsWith(matrix.build, 'anaconda') }} run: python3 -m pip install -U matplotlib + if: ${{ ! startsWith(matrix.build, 'anaconda') }} - name: Setup Miniconda + uses: conda-incubator/setup-miniconda@v3.0.4 if: startsWith(matrix.build, 'anaconda macos') - uses: conda-incubator/setup-miniconda@v3.0.3 - name: Install Matplotlib (Anaconda) - if: startsWith(matrix.build, 'anaconda') run: $CONDA/bin/conda install conda-forge::matplotlib - - name: Install Rust (rustup) - run: | - rustup update --no-self-update - rustup default ${{ matrix.rust }} - - run: cargo build -v + if: startsWith(matrix.build, 'anaconda') + - name: Install Rust + uses: dtolnay/rust-toolchain + with: + toolchain: ${{ matrix.rust }} + - run: cargo build + if: ${{ ! startsWith(matrix.build, 'anaconda') }} - run: cargo test if: ${{ ! startsWith(matrix.build, 'anaconda') }} - run: cargo run --example a_simple_example @@ -71,8 +72,13 @@ jobs: - name: Run example with Anaconda on MacOS continue-on-error: true if: startsWith(matrix.build, 'anaconda macos') + shell: bash run: | eval "$($CONDA/bin/conda shell.bash activate)" - export DYLD_LIBRARY_PATH=$CONDA_PREFIX/lib + # export DYLD_LIBRARY_PATH=$CONDA_PREFIX/lib/py + # mkdir $CONDA_PREFIX/lib/py + # ln -s $CONDA_PREFIX/lib/libpython* $DYLD_LIBRARY_PATH + mkdir -p target/debug/deps + ln -s target/debug/deps $CONDA_PREFIX/lib/libpython* cargo run --example a_simple_example cargo run --example flower