diff --git a/.github/workflows/check-mkl-interfaces.yaml b/.github/workflows/check-mkl-interfaces.yaml index 2170cbc30acc..fb294e7c4929 100644 --- a/.github/workflows/check-mkl-interfaces.yaml +++ b/.github/workflows/check-mkl-interfaces.yaml @@ -48,7 +48,7 @@ jobs: - name: Merge conda env files run: | - conda-merge ${{ env.build-with-oneapi-env }} ${{ env.dpctl-pkg-env }} ${{ env.oneapi-pkgs-env }} > ${{ env.environment-file }} + conda-merge ${{ env.dpctl-pkg-env }} ${{ env.oneapi-pkgs-env }} ${{ env.build-with-oneapi-env }} > ${{ env.environment-file }} cat ${{ env.environment-file }} - name: Upload artifact diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 62a0e4390d73..9baa073feebb 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -93,13 +93,13 @@ jobs: continue-on-error: true run: conda build --no-test --python ${{ matrix.python }} --numpy 2.0 ${{ env.channels-list }} conda-recipe env: - MAX_BUILD_CMPL_MKL_VERSION: '2025.1a0' + MAX_BUILD_CMPL_MKL_VERSION: '2025.2a0' - name: ReBuild conda package if: steps.build_conda_pkg.outcome == 'failure' run: conda build --no-test --python ${{ matrix.python }} --numpy 2.0 ${{ env.channels-list }} conda-recipe env: - MAX_BUILD_CMPL_MKL_VERSION: '2025.1a0' + MAX_BUILD_CMPL_MKL_VERSION: '2025.2a0' - name: Upload artifact uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2