Skip to content

Commit 042737f

Browse files
committed
Test 25
1 parent 30d2d67 commit 042737f

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed

.github/workflows/rust.yml

+15-10
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,20 @@ jobs:
4545
python-version: '3.12'
4646
if: ${{ ! startsWith(matrix.build, 'anaconda') }}
4747
- name: Install Matplotlib (pip)
48-
if: ${{ ! startsWith(matrix.build, 'anaconda') }}
4948
run: python3 -m pip install -U matplotlib
49+
if: ${{ ! startsWith(matrix.build, 'anaconda') }}
5050
- name: Setup Miniconda
51+
uses: conda-incubator/[email protected]
5152
if: startsWith(matrix.build, 'anaconda macos')
52-
uses: conda-incubator/[email protected]
5353
- name: Install Matplotlib (Anaconda)
54-
if: startsWith(matrix.build, 'anaconda')
5554
run: $CONDA/bin/conda install conda-forge::matplotlib
56-
- name: Install Rust (rustup)
57-
run: |
58-
rustup update --no-self-update
59-
rustup default ${{ matrix.rust }}
60-
- run: cargo build -v
55+
if: startsWith(matrix.build, 'anaconda')
56+
- name: Install Rust ${{ matrix.rust }}
57+
uses: dtolnay/rust-toolchain@stable
58+
with:
59+
toolchain: ${{ matrix.rust }}
60+
- run: cargo build
61+
if: ${{ ! startsWith(matrix.build, 'anaconda') }}
6162
- run: cargo test
6263
if: ${{ ! startsWith(matrix.build, 'anaconda') }}
6364
- run: cargo run --example a_simple_example
@@ -66,13 +67,17 @@ jobs:
6667
if: startsWith(matrix.build, 'anaconda linux')
6768
run: |
6869
eval "$($CONDA/bin/conda shell.bash activate)"
69-
export LD_LIBRARY_PATH=$CONDA_PREFIX/lib
70+
#export LD_LIBRARY_PATH=$CONDA_PREFIX/lib
71+
mkdir -p target/debug/deps
72+
ln -s target/debug/deps $CONDA_PREFIX/lib/libpython*
7073
cargo run --example a_simple_example
7174
- name: Run example with Anaconda on MacOS
7275
continue-on-error: true
7376
if: startsWith(matrix.build, 'anaconda macos')
77+
shell: bash
7478
run: |
7579
eval "$($CONDA/bin/conda shell.bash activate)"
76-
export DYLD_LIBRARY_PATH=$CONDA_PREFIX/lib
80+
mkdir -p target/debug/deps
81+
ln -s $CONDA_PREFIX/lib/libpython* target/debug/deps
7782
cargo run --example a_simple_example
7883
cargo run --example flower

0 commit comments

Comments
 (0)