diff --git a/.github/workflows/build-with-clang.yml b/.github/workflows/build-with-clang.yml index 81450c0..486f2bd 100644 --- a/.github/workflows/build-with-clang.yml +++ b/.github/workflows/build-with-clang.yml @@ -1,8 +1,10 @@ name: Build mkl-service with clang + on: - pull_request: push: - branches: [master] + branches: + - master + pull_request: permissions: read-all diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index b9c9946..12bbc10 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -1,6 +1,10 @@ name: Conda package -on: push +on: + push: + branches: + - master + pull_request: permissions: read-all @@ -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: | @@ -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