From 93e9b9354c47ea9adbb940b8793fc7dc4e09bdb3 Mon Sep 17 00:00:00 2001
From: Philipp Spilger <philipp.spilger@kip.uni-heidelberg.de>
Date: Wed, 28 Feb 2024 14:19:24 +0100
Subject: [PATCH] fix: Allow unset build-cache-on-failure-name
Change-Id: I1c032ef37cbfbf82a04aceb17d1275f344122e44
---
lib/yashchiki/preserve_built_spack_packages.sh | 5 +++++
share/yashchiki/styles/asic/create_recipe.sh | 2 +-
share/yashchiki/styles/visionary/create_recipe.sh | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/lib/yashchiki/preserve_built_spack_packages.sh b/lib/yashchiki/preserve_built_spack_packages.sh
index b1866294..e7b97d0f 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 6dc5e372..588ea5e1 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 ec053202..a7447ec0 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}"
--
GitLab