diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 87ba4db0..36dacd6e 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -45,8 +45,12 @@ fi if [ -z "${DOCKER_IMAGE}" ]; then SHYAML_INSTALLED="$(shyaml -h || echo NO)" if [ "${SHYAML_INSTALLED}" == "NO" ]; then - echo "WARNING: DOCKER_IMAGE variable not set and shyaml not installed. Falling back to condaforge/linux-anvil-comp7" - DOCKER_IMAGE="condaforge/linux-anvil-comp7" + echo "WARNING: DOCKER_IMAGE variable not set and shyaml not installed. Trying to parse with coreutils" + DOCKER_IMAGE=$(cat .ci_support/${CONFIG}.yaml | grep '^docker_image:$' -A 1 | tail -n 1 | cut -b 3-) + if [ "${DOCKER_IMAGE}" = "" ]; then + echo "No docker_image entry found in ${CONFIG}. Falling back to condaforge/linux-anvil-comp7" + DOCKER_IMAGE="condaforge/linux-anvil-comp7" + fi else DOCKER_IMAGE="$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 condaforge/linux-anvil-comp7 )" fi @@ -64,8 +68,8 @@ fi export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}" docker run ${DOCKER_RUN_ARGS} \ - -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw,z \ - -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z \ + -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw,z,delegated \ + -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z,delegated \ -e CONFIG \ -e HOST_USER_ID \ -e UPLOAD_PACKAGES \ diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d3f9c061..96555e41 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set version = "3.9.0" %} -{% set build_num = 4 %} +{% set build_num = 5 %} {% set version_major = version.split(".")[0] %} {% set blas_major = "2" %} @@ -58,7 +58,7 @@ outputs: - libopenblas 0.3.12 # [blas_impl == 'openblas'] # 3.9.0 is supported from mkl 2020.4 - mkl 2020.4 # [blas_impl == 'mkl'] - - blis 0.7.0 # [blas_impl == 'blis'] + - blis 0.8.0 # [blas_impl == 'blis'] run: - {{ pin_compatible("libopenblas", max_pin="x.x.x", exact=win) }} # [blas_impl == 'openblas'] - {{ pin_compatible("mkl", max_pin="x", exact=win) }} # [blas_impl == 'mkl'] @@ -202,7 +202,7 @@ outputs: - {{ pin_subpackage("libcblas", exact=True) }} - {{ pin_subpackage("libblas", exact=True) }} {% else %} - - blis 0.7.0 + - blis 0.8.0 {% endif %} run: - {{ pin_subpackage("liblapack", exact=True) }} # [blas_impl != 'blis']