Skip to content
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
d04a2f9
chore: remove hack added to push through noir sync
TomAFrench Mar 18, 2025
13bc5b6
chore: Update noir-repo-ref to 24e2217347cf8a0021d419fa992e1c09316e77b0
TomAFrench Mar 18, 2025
4650c28
.
TomAFrench Mar 18, 2025
dde2504
.
TomAFrench Mar 18, 2025
48957b1
Merge branch 'master' into tf/remove-hack
TomAFrench Mar 18, 2025
1a6a05b
.
TomAFrench Mar 18, 2025
a347147
.
TomAFrench Mar 18, 2025
f9f8501
Merge branch 'master' into tf/remove-hack
TomAFrench Mar 19, 2025
2682f3d
.
TomAFrench Mar 19, 2025
72d70f1
chore: remove `REPO_PATH` variable
TomAFrench Mar 19, 2025
d253e10
.
TomAFrench Mar 19, 2025
53b0b2f
.
TomAFrench Mar 19, 2025
0b47083
Update ci3/npm_install_deps
TomAFrench Mar 19, 2025
a5eb0c0
chore: cache hash for noir cache
TomAFrench Mar 19, 2025
6658245
fix: extra space
TomAFrench Mar 19, 2025
e9f271a
.
TomAFrench Mar 19, 2025
6fe29cc
Merge branch 'master' into tf/remove-hack
TomAFrench Mar 19, 2025
e5e24ea
chore: pass down nargo hash into `noir-projects`
TomAFrench Mar 19, 2025
94184eb
chore: pass in `NARGO_HASH` from root `bootstrap.sh`
TomAFrench Mar 19, 2025
020fbba
.
TomAFrench Mar 19, 2025
6e76983
chore: remove changers to `noir_content_hash`
TomAFrench Mar 19, 2025
f677496
chore: push noir syncs down to be more granular
TomAFrench Mar 19, 2025
010ef16
chore: add header for noir sync
TomAFrench Mar 19, 2025
ae1cbfd
Merge branch 'master' into tf/remove-hack
TomAFrench Mar 19, 2025
9de7880
chore: rename env vars and fix assignments
TomAFrench Mar 20, 2025
c6d4a3a
chore: always sync and hash noir repo
TomAFrench Mar 20, 2025
f14d1f9
.
TomAFrench Mar 20, 2025
9bcd091
Merge branch 'master' into tf/remove-hack
TomAFrench Mar 20, 2025
ce34ce3
Merge branch 'master' into tf/remove-hack
TomAFrench Mar 20, 2025
9f5b7b3
Merge branch 'master' into tf/remove-hack
TomAFrench Mar 20, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ci3/npm_install_deps
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
# Note this cache pull won't restore .yarn, which means a subsequent "yarn install" may still be slow.
# This doesn't matter in CI however.
NO_CD=1 source ${root:-$(git rev-parse --show-toplevel)}/ci3/source
REPO_PATH=$(git rev-parse --show-toplevel)
Comment thread
TomAFrench marked this conversation as resolved.

if [ ! -f yarn.lock ]; then
echo_stderr "yarn.lock not found in $PWD."
exit 1
fi

yarn_lock_path=$(realpath yarn.lock --relative-to=$root)
yarn_lock_path=$(realpath yarn.lock --relative-to=$REPO_PATH)

if [ "$CI" -eq 1 ]; then
nm_hash=$(cache_content_hash "^$yarn_lock_path")
Expand Down
6 changes: 0 additions & 6 deletions noir/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -88,18 +88,12 @@ function build_packages {
if cache_download noir-packages-$hash.tar.gz; then
cd noir-repo
npm_install_deps
# Hack to get around failure introduced by https://github.com/AztecProtocol/aztec-packages/pull/12371
# Tests fail with message "env: ‘mocha’: No such file or directory"
yarn install
return
fi

cd noir-repo
npm_install_deps

# Hack to get around failure introduced by https://github.com/AztecProtocol/aztec-packages/pull/12371
# Tests fail with message "env: ‘mocha’: No such file or directory"
yarn install
yarn workspaces foreach -A --parallel --topological-dev --verbose $js_include run build

# We create a folder called packages, that contains each package as it would be published to npm, named correctly.
Expand Down