From e40d1ce99ba7af086eb202319f71602d09374fdb Mon Sep 17 00:00:00 2001 From: Torsten Marco Knodt <191793499+torsknod2@users.noreply.github.com> Date: Sun, 12 Jan 2025 14:42:37 +0000 Subject: [PATCH] Fall back to install_and_cache_pkg.sh if restore_pkg.sh fails --- post_cache_action.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/post_cache_action.sh b/post_cache_action.sh index f71c336..9a9b35f 100755 --- a/post_cache_action.sh +++ b/post_cache_action.sh @@ -28,10 +28,6 @@ test "${debug}" = "true" && set -x # List of the packages to use. packages="${@:6}" -if test "${cache_hit}" = "true"; then - ${script_dir}/restore_pkgs.sh "${cache_dir}" "${cache_restore_root}" "${execute_install_scripts}" "${debug}" -else - ${script_dir}/install_and_cache_pkgs.sh "${cache_dir}" "${debug}" ${packages} -fi +([ "${cache_hit}" = "true" ] && ${script_dir}/restore_pkgs.sh "${cache_dir}" "${cache_restore_root}" "${execute_install_scripts}" "${debug}") || ${script_dir}/install_and_cache_pkgs.sh "${cache_dir}" "${debug}" ${packages} log_empty_line