fix: rebuild patterns

AztecProtocol · Oct 9, 2024 · 230d53a · 230d53a
1 parent a1ef911
commit 230d53a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/avm-transpiler/Earthfile b/avm-transpiler/Earthfile
@@ -15,7 +15,7 @@ build:
     # build avm transpiler, and make sure the big build and deps folders don't hit cache
     DO ../build-system/s3-cache-scripts/+WITH_CACHE \
         --prefix="avm-transpiler" \
-        --rebuild_patterns=".rebuild_patterns" \
+        --rebuild_patterns="../noir/.rebuild_patterns_native .rebuild_patterns" \
         --command="./scripts/bootstrap_native.sh && rm -rf target/release/{build,deps}" \
         --build_artifacts="target"
     SAVE ARTIFACT target/release/avm-transpiler avm-transpiler

diff --git a/avm-transpiler/bootstrap_cache.sh b/avm-transpiler/bootstrap_cache.sh
@@ -5,5 +5,5 @@ cd "$(dirname "$0")"
 source ../build-system/scripts/setup_env '' '' mainframe_$USER > /dev/null
 
 echo -e "\033[1mRetrieving avm-transpiler from remote cache...\033[0m"
-HASH=$(AZTEC_CACHE_REBUILD_PATTERNS=.rebuild_patterns compute-content-hash.sh)
+HASH=$(AZTEC_CACHE_REBUILD_PATTERNS="../noir/.rebuild_patterns_native .rebuild_patterns" compute-content-hash.sh)
 cache-download.sh avm-transpiler-$HASH.tar.gz > /dev/null
diff --git a/barretenberg/ts/bootstrap_cache.sh b/barretenberg/ts/bootstrap_cache.sh
@@ -5,8 +5,11 @@ cd "$(dirname "$0")"
 source ../../build-system/scripts/setup_env '' '' mainframe_$USER > /dev/null
 
 echo -e "\033[1mRetrieving bb.js from remote cache...\033[0m"
-extract_repo_if_working_copy_clean bb.js /usr/src/barretenberg/ts/dest .
+HASH=$(AZTEC_CACHE_REBUILD_PATTERNS="../cpp/.rebuild_patterns .rebuild_patterns" compute-content-hash.sh)
+
+cache-download.sh bb.js-esm-$HASH.tar.gz > /dev/null
+cache-download.sh bb.js-cjs-$HASH.tar.gz > /dev/null
+cache-download.sh bb.js-browser-$HASH.tar.gz > /dev/null
+
 # Annoyingly we still need to install modules, so they can be found as part of module resolution when portalled.
 yarn install
-
-remove_old_images bb.js
diff --git a/noir/bootstrap_cache.sh b/noir/bootstrap_cache.sh
@@ -9,5 +9,5 @@ NATIVE_HASH=$(AZTEC_CACHE_REBUILD_PATTERNS=.rebuild_patterns_native compute-cont
 cache-download.sh noir-nargo-$NATIVE_HASH.tar.gz > /dev/null
 
 echo -e "\033[1mRetrieving nargo from remote cache...\033[0m"
-PACKAGES_HASH=$(AZTEC_CACHE_REBUILD_PATTERNS=.rebuild_patterns_packages compute-content-hash.sh)
+PACKAGES_HASH=$(AZTEC_CACHE_REBUILD_PATTERNS="../barretenberg/cpp/.rebuild_patterns .rebuild_patterns_packages" compute-content-hash.sh)
 cache-download.sh noir-packages-$PACKAGES_HASH.tar.gz