diff --git a/lib/yashchiki/preserve_built_spack_packages.sh b/lib/yashchiki/preserve_built_spack_packages.sh index b1866294b31a0d026a5f4f3ebe132ab76f3c06e4..e7b97d0fd4fd2288109fef348ee09f6649333fea 100755 --- a/lib/yashchiki/preserve_built_spack_packages.sh +++ b/lib/yashchiki/preserve_built_spack_packages.sh @@ -23,6 +23,11 @@ sourcedir="$(dirname "$(readlink -m "${BASH_SOURCE[0]}")")" source "${sourcedir}/commons.sh" source "${sourcedir}/setup_env_spack.sh" +if [ -z "${YASHCHIKI_BUILD_CACHE_ON_FAILURE_NAME:-}" ]; then + echo "No name for build cache on failure given, skipping saving preserved packages." + exit 0 +fi + # find empty directory to dump into build_num=1 while /bin/true; do diff --git a/share/yashchiki/styles/asic/create_recipe.sh b/share/yashchiki/styles/asic/create_recipe.sh index 6dc5e372b5ce97ebdad1417741e17176dc32d42a..588ea5e1c26a9c32efa56ca2d501935c3cdb7f8f 100755 --- a/share/yashchiki/styles/asic/create_recipe.sh +++ b/share/yashchiki/styles/asic/create_recipe.sh @@ -250,7 +250,7 @@ From: ${DOCKER_BASE_IMAGE} export YASHCHIKI_SPACK_CONFIG="/tmp/spack_config" export YASHCHIKI_CACHES_ROOT="${YASHCHIKI_CACHES_ROOT}" export YASHCHIKI_BUILD_CACHE_NAME="${YASHCHIKI_BUILD_CACHE_NAME}" - export YASHCHIKI_BUILD_CACHE_ON_FAILURE_NAME="${YASHCHIKI_BUILD_CACHE_ON_FAILURE_NAME}" + export YASHCHIKI_BUILD_CACHE_ON_FAILURE_NAME="${YASHCHIKI_BUILD_CACHE_ON_FAILURE_NAME:-}" export YASHCHIKI_SPACK_VERBOSE="${YASHCHIKI_SPACK_VERBOSE}" export YASHCHIKI_DEBUG=${YASHCHIKI_DEBUG} export CONTAINER_STYLE="${CONTAINER_STYLE}" diff --git a/share/yashchiki/styles/visionary/create_recipe.sh b/share/yashchiki/styles/visionary/create_recipe.sh index ec053202569ecad63814783eec2ef4cb51411c51..a7447ec079628eba55653ea4322612b6474f3bef 100755 --- a/share/yashchiki/styles/visionary/create_recipe.sh +++ b/share/yashchiki/styles/visionary/create_recipe.sh @@ -80,7 +80,7 @@ From: ${DOCKER_BASE_IMAGE} export YASHCHIKI_SPACK_CONFIG="/tmp/spack_config" export YASHCHIKI_CACHES_ROOT="${YASHCHIKI_CACHES_ROOT}" export YASHCHIKI_BUILD_CACHE_NAME="${YASHCHIKI_BUILD_CACHE_NAME}" - export YASHCHIKI_BUILD_CACHE_ON_FAILURE_NAME="${YASHCHIKI_BUILD_CACHE_ON_FAILURE_NAME}" + export YASHCHIKI_BUILD_CACHE_ON_FAILURE_NAME="${YASHCHIKI_BUILD_CACHE_ON_FAILURE_NAME:-}" export YASHCHIKI_SPACK_VERBOSE="${YASHCHIKI_SPACK_VERBOSE}" export YASHCHIKI_DEBUG=${YASHCHIKI_DEBUG} export CONTAINER_STYLE="${CONTAINER_STYLE}"