Skip to content

Commit 3d84b6e

Browse files
committed
Add additional conda/mamba clean before all install commands
Update test commands for windows Unpin mamba for conda-recipe test
1 parent 3ef3315 commit 3d84b6e

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

.github/workflows/conda_recipe.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
channel-priority: strict
4141
miniforge-version: latest
4242
use-mamba: true
43-
mamba-version: "1.5.10"
43+
# mamba-version: "1.5.10"
4444
conda-remove-defaults: true
4545
- name: Install conda-build
4646
run: |

.github/workflows/test-suite.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,16 +170,22 @@ jobs:
170170
- name: Install doxgen on unix systems
171171
if: matrix.os != 'windows-latest'
172172
run: |
173+
conda clean --all
174+
mamba clean --all
173175
mamba install doxygen>=1.9.2 graphviz -y
174176
- name: Install compilers using conda on Linux/Mac
175177
if: matrix.os != 'windows-latest' && matrix.with-valgrind != true
176178
run: |
179+
conda clean --all
180+
mamba clean --all
177181
mamba install c-compiler cxx-compiler
178182
- name: Install valgrind on unix systems (and required debug symbols)
179183
if: matrix.os != 'windows-latest' && matrix.with-valgrind == true
180184
run: |
181185
sudo apt-get update
182186
sudo apt-get install libc6-dbg
187+
conda clean --all
188+
mamba clean --all
183189
mamba install valgrind
184190
185191
###################################

recipe/meta.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ test:
3737
- test -f $PREFIX/lib/libEPhotosynthesis$SHLIB_EXT # [unix]
3838
- test -f $PREFIX/include/ePhotosynthesis/ePhotosynthesis.hpp # [unix]
3939
- test -f $PREFIX/bin/ePhoto # [unix]
40-
- if not exist %LIBRARY_LIB%\\libEPhotosynthesis.dll exit 1 # [win]
40+
- if not exist %LIBRARY_LIB%\\EPhotosynthesis.lib exit 1 # [win]
41+
- if not exist %LIBRARY_BIN%\\EPhotosynthesis.dll exit 1 # [win]
4142
- if not exist %LIBRARY_INC%\\ePhotosynthesis\\ePhotosynthesis.hpp exit 1 # [win]
4243
- if not exist %LIBRARY_BIN%\\ePhoto.exe exit 1 # [win]
4344

0 commit comments

Comments
 (0)