Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/build-with-clang.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
name: Build mkl-service with clang

on:
pull_request:
push:
branches: [master]
branches:
- master
pull_request:

permissions: read-all

Expand Down
11 changes: 9 additions & 2 deletions .github/workflows/conda-package.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: Conda package

on: push
on:
push:
branches:
- master
pull_request:

permissions: read-all

Expand Down Expand Up @@ -218,6 +222,8 @@ jobs:
restore-keys: |
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-
# add intel-openmp as an explicit dependency
# to avoid it being missed when package version is specified exactly
- name: Install mkl-service
shell: cmd
run: |
Expand All @@ -227,7 +233,8 @@ jobs:
FOR /F "tokens=* USEBACKQ" %%F IN (`python -c "%SCRIPT%"`) DO (
SET PACKAGE_VERSION=%%F
)
conda create -n ${{ env.TEST_ENV_NAME }} ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% pytest python=${{ matrix.python }} -c ${{ env.GITHUB_WORKSPACE }}/channel ${{ env.CHANNELS }}
SET "WORKAROUND_DEPENDENCIES=intel-openmp"
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 }}
# Test installed packages
conda list
- name: Run tests
Expand Down
Loading