From d599577692abacc02eafc84877df50868f21564e Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Wed, 4 May 2022 02:10:00 +0000 Subject: [PATCH 1/2] Log output cache contents Makes it easier to debug cache preservation bugs. --- tools/cirrus_build_project.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/cirrus_build_project.sh b/tools/cirrus_build_project.sh index f49cb4e..92f2388 100755 --- a/tools/cirrus_build_project.sh +++ b/tools/cirrus_build_project.sh @@ -50,6 +50,9 @@ cp -a ./out_cache1/* ./out/ || true cp -a ./out_cache2/* ./out/ || true cp -a ./out_cache3/* ./out/ || true +echo "Initial output cache contents:" +find ./out/ + echo "Unpacking interrupted cache..." ./tools/cirrus_unpack_interrupted.sh || true @@ -116,6 +119,9 @@ fi echo "Cleaning containers..." rm -rfv out/container-image +echo "Final output cache contents:" +find ./out/ + echo "Splitting caches..." rsync -avu --delete ./out/encaya ./out/gocrosssign ./out/gosafetlsa ./out/q ./out_cache1/ || true rsync -avu --delete ./out/macosx-toolchain ./out_cache2/ || true From 2f57c4a857193eadfca5efac22cec189e2027976 Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Wed, 4 May 2022 02:45:37 +0000 Subject: [PATCH 2/2] Log size of output cache contents Makes it easier to debug cache splitting. --- tools/cirrus_build_project.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/cirrus_build_project.sh b/tools/cirrus_build_project.sh index 92f2388..6cda87a 100755 --- a/tools/cirrus_build_project.sh +++ b/tools/cirrus_build_project.sh @@ -51,7 +51,7 @@ cp -a ./out_cache2/* ./out/ || true cp -a ./out_cache3/* ./out/ || true echo "Initial output cache contents:" -find ./out/ +find ./out/ -printf "%p %k KiB\n" echo "Unpacking interrupted cache..." ./tools/cirrus_unpack_interrupted.sh || true @@ -120,7 +120,7 @@ echo "Cleaning containers..." rm -rfv out/container-image echo "Final output cache contents:" -find ./out/ +find ./out/ -printf "%p %k KiB\n" echo "Splitting caches..." rsync -avu --delete ./out/encaya ./out/gocrosssign ./out/gosafetlsa ./out/q ./out_cache1/ || true