From c23e6700de8767933bb51eca9ecdbf095bccaa79 Mon Sep 17 00:00:00 2001 From: ludamad Date: Wed, 19 Feb 2025 17:29:32 -0500 Subject: [PATCH 1/2] chore: work around bugs using cache_content_hash --- ci3/cache_content_hash | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ci3/cache_content_hash b/ci3/cache_content_hash index 393a4bd573e5..b35f5e72d3eb 100755 --- a/ci3/cache_content_hash +++ b/ci3/cache_content_hash @@ -47,8 +47,7 @@ diff="$({ if [ -n "$diff" ]; then # Fail. We shouldn't be writing files during the build. if [ "${CI:-0}" = 1 ]; then - echo "Noticed changes to rebuild patterns: "$@", would disable cache but being strict because CI=1. Changed file names: $diff" - exit 1 + echo "WARNING: Noticed changes to rebuild patterns: $diff" > /dev/tty fi # Signal to cache_upload and cache_download to not touch this file. echo "disabled-cache" From f61cefa263e8f4bc34ace117ca95beb000aebf23 Mon Sep 17 00:00:00 2001 From: ludamad Date: Wed, 19 Feb 2025 17:33:59 -0500 Subject: [PATCH 2/2] Update cache_content_hash --- ci3/cache_content_hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci3/cache_content_hash b/ci3/cache_content_hash index b35f5e72d3eb..8cc33b5c703f 100755 --- a/ci3/cache_content_hash +++ b/ci3/cache_content_hash @@ -47,7 +47,7 @@ diff="$({ if [ -n "$diff" ]; then # Fail. We shouldn't be writing files during the build. if [ "${CI:-0}" = 1 ]; then - echo "WARNING: Noticed changes to rebuild patterns: $diff" > /dev/tty + echo_stderr "WARNING: Noticed changes to rebuild patterns: $diff" fi # Signal to cache_upload and cache_download to not touch this file. echo "disabled-cache"