Skip to content

Commit 7f2a181

Browse files
authored
fix test windows in CI (#63)
1 parent a49a94e commit 7f2a181

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

.github/workflows/build-with-clang.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
name: Build mkl-service with clang
2+
23
on:
3-
pull_request:
44
push:
5-
branches: [master]
5+
branches:
6+
- master
7+
pull_request:
68

79
permissions: read-all
810

.github/workflows/conda-package.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
name: Conda package
22

3-
on: push
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
48

59
permissions: read-all
610

@@ -218,6 +222,8 @@ jobs:
218222
restore-keys: |
219223
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-
220224
${{ 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
221227
- name: Install mkl-service
222228
shell: cmd
223229
run: |
@@ -227,7 +233,8 @@ jobs:
227233
FOR /F "tokens=* USEBACKQ" %%F IN (`python -c "%SCRIPT%"`) DO (
228234
SET PACKAGE_VERSION=%%F
229235
)
230-
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 }}
231238
# Test installed packages
232239
conda list
233240
- name: Run tests

0 commit comments

Comments
 (0)