From 112d6cab2a303fcfe1bf2535ed358ba8d169a9a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= Date: Mon, 20 Jan 2025 10:10:29 +0100 Subject: [PATCH 1/2] software: always ship the source or source offer Even when restoring the build from cache --- lib/omnibus/software.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/omnibus/software.rb b/lib/omnibus/software.rb index fa5b62312..e99a788a1 100644 --- a/lib/omnibus/software.rb +++ b/lib/omnibus/software.rb @@ -1291,6 +1291,8 @@ def build_me(build_wrappers = []) elsif git_cache.restore log.info(log_key) { "Restored from cache" } @build_summary["cached"] = true + # Ensure we ship the source offer even when restoring from cache + fetcher.deploy else log.info(log_key) { "Could not restore from cache" } execute_build(build_wrappers) From a738aa7cb277b7f72917a0356ffb08c933d1ff1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= Date: Mon, 20 Jan 2025 12:59:49 +0100 Subject: [PATCH 2/2] attempt clean instead of deployed deploy isn't available for all fetchers --- lib/omnibus/software.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/omnibus/software.rb b/lib/omnibus/software.rb index e99a788a1..110de6dd7 100644 --- a/lib/omnibus/software.rb +++ b/lib/omnibus/software.rb @@ -1292,7 +1292,7 @@ def build_me(build_wrappers = []) log.info(log_key) { "Restored from cache" } @build_summary["cached"] = true # Ensure we ship the source offer even when restoring from cache - fetcher.deploy + fetcher.clean else log.info(log_key) { "Could not restore from cache" } execute_build(build_wrappers)