Skip to content

Commit fd52cc8

Browse files
committed
Fix Linux examples
Use a single solve (like on Windows)
1 parent 80d9e99 commit fd52cc8

1 file changed

Lines changed: 4 additions & 12 deletions

File tree

‎.github/workflows/conda-package-cf.yml‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -472,21 +472,13 @@ jobs:
472472
if [ -z "${PYTHON_VER}" ]; then
473473
PYTHON_VER="${{ matrix.python }}"
474474
fi
475-
# shellcheck disable=SC2086
476-
conda create -n ${{ env.EXAMPLES_ENV_NAME }} -y pytest python="${PYTHON_VER}" "setuptools<72.2.0" $CHANNELS
477-
echo "Environment created"
478-
# shellcheck disable=SC2086
479-
conda install -n ${{ env.EXAMPLES_ENV_NAME }} -y cmake ninja $CHANNELS || exit 1
480-
echo "Cmake and Ninja installed"
481-
# shellcheck disable=SC2086
482-
conda install -n ${{ env.EXAMPLES_ENV_NAME }} -y pybind11 cython scikit-build $CHANNELS || exit 1
483-
echo "scikit-build installed"
484475
# tbb-devel carries TBBConfig.cmake, which the oneMKL example looks for,
485476
# and intel-opencl-rt provides the OpenCL CPU device to run examples on
486477
# shellcheck disable=SC2086
487-
conda install -n ${{ env.EXAMPLES_ENV_NAME }} -y mkl-dpcpp mkl-devel-dpcpp \
488-
tbb-devel intel-opencl-rt $CHANNELS || exit 1
489-
echo "IPL installed"
478+
conda create -n ${{ env.EXAMPLES_ENV_NAME }} -y pytest python="${PYTHON_VER}" \
479+
"setuptools<72.2.0" cmake ninja pybind11 cython scikit-build \
480+
mkl-dpcpp mkl-devel-dpcpp tbb-devel intel-opencl-rt $CHANNELS || exit 1
481+
echo "Environment created"
490482
# shellcheck disable=SC2086
491483
conda create -y -n ${{ env.BUILD_ENV_NAME }} $CHANNELS \
492484
"gcc_linux-64=${{ env.GCC_CMPLR_VERSION }}" "gxx_linux-64=${{ env.GCC_CMPLR_VERSION }}" \

0 commit comments

Comments
 (0)