Skip to content

Commit 234ecc6

Browse files
authored
Merge branch 'master' into copy-right
2 parents 2c7ec41 + 7f2a181 commit 234ecc6

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

.github/workflows/conda-package.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,8 @@ jobs:
222222
restore-keys: |
223223
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-
224224
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-
225+
# add intel-openmp as an explicit dependency
226+
# to avoid it being missed when package version is specified exactly
225227
- name: Install mkl-service
226228
shell: cmd
227229
run: |
@@ -231,7 +233,8 @@ jobs:
231233
FOR /F "tokens=* USEBACKQ" %%F IN (`python -c "%SCRIPT%"`) DO (
232234
SET PACKAGE_VERSION=%%F
233235
)
234-
conda create -n ${{ env.TEST_ENV_NAME }} ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% pytest python=${{ matrix.python }} -c ${{ env.GITHUB_WORKSPACE }}/channel ${{ env.CHANNELS }}
236+
SET "WORKAROUND_DEPENDENCIES=intel-openmp"
237+
conda create -n ${{ env.TEST_ENV_NAME }} ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% %WORKAROUND_DEPENDENCIES% pytest python=${{ matrix.python }} -c ${{ env.GITHUB_WORKSPACE }}/channel ${{ env.CHANNELS }}
235238
# Test installed packages
236239
conda list
237240
- name: Run tests

0 commit comments

Comments
 (0)