From cbcfc3364756d7c57c12370c70fa74037a94df87 Mon Sep 17 00:00:00 2001 From: ludamad Date: Mon, 13 Jan 2025 10:03:57 -0500 Subject: [PATCH 1/5] fix: docs rebuild patterns Fixes caching for CI/local dev --- docs/.rebuild_patterns | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/.rebuild_patterns b/docs/.rebuild_patterns index f84dde35f91..20450911c85 100644 --- a/docs/.rebuild_patterns +++ b/docs/.rebuild_patterns @@ -1,5 +1,5 @@ ^docs/src ^docs/scripts ^docs/static -^docs/*.js -^docs/*.json \ No newline at end of file +^docs/.*\.js +^docs/.*\.json From 565b6e3263fd561807f8a29832bb52543d739cf0 Mon Sep 17 00:00:00 2001 From: ludamad Date: Mon, 13 Jan 2025 11:35:23 -0500 Subject: [PATCH 2/5] adhoc install support --- Earthfile | 1 + build-images/adhoc-installs.sh | 8 ++++++++ 2 files changed, 9 insertions(+) create mode 100644 build-images/adhoc-installs.sh diff --git a/Earthfile b/Earthfile index ca980143f3f..ba5a728c1fb 100644 --- a/Earthfile +++ b/Earthfile @@ -23,6 +23,7 @@ bootstrap-noir-bb: git remote add origin https://github.com/aztecprotocol/aztec-packages >/dev/null 2>&1 && (git fetch --depth 1 origin $EARTHLY_GIT_HASH >/dev/null 2>&1 || (echo "The commit was not pushed, run aborted." && exit 1)) && git reset --hard FETCH_HEAD >/dev/null 2>&1 && + ./build-images/adhoc-installs.sh && DENOISE=1 CI=1 ./noir/bootstrap.sh fast && DENOISE=1 CI=1 ./barretenberg/bootstrap.sh fast && mv $(ls -A) /usr/src' diff --git a/build-images/adhoc-installs.sh b/build-images/adhoc-installs.sh new file mode 100644 index 00000000000..fd9c9518954 --- /dev/null +++ b/build-images/adhoc-installs.sh @@ -0,0 +1,8 @@ +# The correct action to take in case of a missing installation is to update the build images. +# However, they will not be updated automatically going forward. +# If unable to ping Charlie or Adam to update the AMIs that have the build image (along with the build images themselves) +# this is a reasonable temporary measure. +set -eu +apt update +# for docs: +apt install libvips-dev From de8523ab36a6845cd7b7a6a499183352fcd0b97e Mon Sep 17 00:00:00 2001 From: ludamad Date: Mon, 13 Jan 2025 11:41:43 -0500 Subject: [PATCH 3/5] fix adhoc step --- Earthfile | 2 +- build-images/adhoc-installs.sh | 0 2 files changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 build-images/adhoc-installs.sh diff --git a/Earthfile b/Earthfile index ba5a728c1fb..337f73b5a87 100644 --- a/Earthfile +++ b/Earthfile @@ -23,7 +23,7 @@ bootstrap-noir-bb: git remote add origin https://github.com/aztecprotocol/aztec-packages >/dev/null 2>&1 && (git fetch --depth 1 origin $EARTHLY_GIT_HASH >/dev/null 2>&1 || (echo "The commit was not pushed, run aborted." && exit 1)) && git reset --hard FETCH_HEAD >/dev/null 2>&1 && - ./build-images/adhoc-installs.sh && + sudo ./build-images/adhoc-installs.sh && DENOISE=1 CI=1 ./noir/bootstrap.sh fast && DENOISE=1 CI=1 ./barretenberg/bootstrap.sh fast && mv $(ls -A) /usr/src' diff --git a/build-images/adhoc-installs.sh b/build-images/adhoc-installs.sh old mode 100644 new mode 100755 From fc3c8fd050c169ceb7970e75571ea62b45070a8c Mon Sep 17 00:00:00 2001 From: ludamad Date: Mon, 13 Jan 2025 12:33:20 -0500 Subject: [PATCH 4/5] drop sudo --- Earthfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Earthfile b/Earthfile index 337f73b5a87..ba5a728c1fb 100644 --- a/Earthfile +++ b/Earthfile @@ -23,7 +23,7 @@ bootstrap-noir-bb: git remote add origin https://github.com/aztecprotocol/aztec-packages >/dev/null 2>&1 && (git fetch --depth 1 origin $EARTHLY_GIT_HASH >/dev/null 2>&1 || (echo "The commit was not pushed, run aborted." && exit 1)) && git reset --hard FETCH_HEAD >/dev/null 2>&1 && - sudo ./build-images/adhoc-installs.sh && + ./build-images/adhoc-installs.sh && DENOISE=1 CI=1 ./noir/bootstrap.sh fast && DENOISE=1 CI=1 ./barretenberg/bootstrap.sh fast && mv $(ls -A) /usr/src' From 984c13481aa7ab119cf91eeae1f0574434720977 Mon Sep 17 00:00:00 2001 From: ludamad Date: Mon, 13 Jan 2025 12:40:04 -0500 Subject: [PATCH 5/5] apt fix --- build-images/adhoc-installs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-images/adhoc-installs.sh b/build-images/adhoc-installs.sh index fd9c9518954..b31d0cb5ff0 100755 --- a/build-images/adhoc-installs.sh +++ b/build-images/adhoc-installs.sh @@ -5,4 +5,4 @@ set -eu apt update # for docs: -apt install libvips-dev +apt install -y libvips-dev