From 25e5b5af559013af6472b79f1aad63b1856024e0 Mon Sep 17 00:00:00 2001 From: Mike Tesch Date: Wed, 19 Feb 2025 12:32:04 -0500 Subject: [PATCH] Automatically append the OS architecture to the cache key --- pre_cache_action.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pre_cache_action.sh b/pre_cache_action.sh index d26b107..c337585 100755 --- a/pre_cache_action.sh +++ b/pre_cache_action.sh @@ -64,7 +64,18 @@ log "Creating cache key..." # and a global cache reset is required, or change in cache action requiring reload. force_update_inc="3" +# Force a different cache key for different architectures (currently x86_64 and aarch64 are available on GitHub) +cpu_arch="$(arch)" +log "- CPU architecture is '${cpu_arch}'." + value="${packages} @ ${version} ${force_update_inc}" + +# Don't invalidate existing caches for the standard ubuntu runners +if [ "${cpu_arch}" != "x86_64" ]; then + value="${value} ${cpu_arch}" + log "- Architecture '${cpu_arch}' added to value." +fi + log "- Value to hash is '${value}'." key="$(echo "${value}" | md5sum | cut -f1 -d' ')"