Skip to content

Commit 7db7f43

Browse files
authored
Merge pull request #47 from IntelPython/fix-test-windows
Fix test_windows in CI
2 parents 99bab18 + 0a092df commit 7db7f43

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

.github/workflows/conda-package.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ permissions: read-all
77
env:
88
PACKAGE_NAME: mkl_umath
99
MODULE_NAME: mkl_umath
10+
VER_SCRIPT1: "import json; f = open('ver.json', 'r'); j = json.load(f); f.close(); d = j['mkl_umath'][0];"
11+
VER_SCRIPT2: "print('='.join((d[s] for s in ('version', 'build'))))"
1012

1113
jobs:
1214
build_linux:
@@ -252,6 +254,7 @@ jobs:
252254
- name: Collect dependencies
253255
shell: cmd /C CALL {0}
254256
run: |
257+
@ECHO ON
255258
IF NOT EXIST ver.json (
256259
copy /Y ${{ env.workdir }}\ver.json .
257260
)
@@ -277,6 +280,8 @@ jobs:
277280
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-
278281
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-
279282
283+
# add intel-openmp as an explicit dependency
284+
# to avoid it being missed when package version is specified exactly
280285
- name: Install mkl_umath
281286
shell: cmd /C CALL {0}
282287
run: |
@@ -289,7 +294,9 @@ jobs:
289294
SET PACKAGE_VERSION=%%F
290295
)
291296
SET "TEST_DEPENDENCIES=pytest pytest-cov"
292-
conda install -n mkl_umath_test ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% %TEST_DEPENDENCIES% python=${{ matrix.python }} -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
297+
SET "WORKAROUND_DEPENDENCIES=intel-openmp"
298+
SET "DEPENDENCIES=%TEST_DEPENDENCIES% %WORKAROUND_DEPENDENCIES%"
299+
conda install -n mkl_umath_test ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% %DEPENDENCIES% python=${{ matrix.python }} -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
293300
294301
- name: Report content of test environment
295302
shell: cmd /C CALL {0}

0 commit comments

Comments
 (0)