cherry-pick: fix: some mac install fixes (#20630) (with conflicts)

* jq install only needed on macos 14.
* python check/install not needed.
* remove inheriterr setting from aztec.sh for mac on bash 3.
* added `test_macs` cmd to aztec-up bootstrap. Launches 14/15/26 macos in parallel and installs on each.
* add `qemu-utils` to devbox.

(cherry picked from commit 44e1ce2)

Author: charlielye

aztec-up/bin/0.0.1/install

@@ -8,12 +8,20 @@
 set -euo pipefail
 
 # Colors
+<<<<<<< HEAD
 reset="\033[0m"
 g="\033[38;5;114m"              # green
 y="\033[38;5;222m"              # yellow
 b="\033[38;5;111m"              # blue
 p="\033[38;5;176m"              # purple
 r="\033[38;5;203m"            # red
+=======
+r="\033[31m" # Red
+g="\033[32m" # Green
+y="\033[33m" # Yellow
+b="\033[34m" # Blue
+reset="\033[0m"
+>>>>>>> 44e1ce22abb (fix: some mac install fixes)
 
 # Helper function to safely read version from versions file
 function get_version {
@@ -140,8 +148,13 @@ function install_node {
   fi
 
   . "$HOME/.nvm/nvm.sh"
+<<<<<<< HEAD
   nvm install "$node_min_version"
   nvm alias default "$node_min_version"
+=======
+  nvm install --lts
+  nvm alias default lts/*
+>>>>>>> 44e1ce22abb (fix: some mac install fixes)
 }
 
 function install_versions_file {
@@ -319,8 +332,13 @@ function main {
   dump_fail install_node
   echo_green "done."
 
+<<<<<<< HEAD
   # Source nvm to ensure node is in PATH (if using nvm).
   [ -f "$HOME/.nvm/nvm.sh" ] && . "$HOME/.nvm/nvm.sh"
+=======
+  # Source nvm to ensure node is in PATH.
+  . "$HOME/.nvm/nvm.sh"
+>>>>>>> 44e1ce22abb (fix: some mac install fixes)
 
   # Install noir
   echo -n "Installing nargo... "

aztec-up/bootstrap.sh

@@ -166,9 +166,14 @@ function prep_test_mac {
   fi
 
   # Cleanup background processes on exit.
+<<<<<<< HEAD
   # Note: can't use local - the trap fires after function scope is gone.
   _bg_pids=()
   trap 'kill "${_bg_pids[@]}" &>/dev/null || true' EXIT
+=======
+  local pids=()
+  trap 'kill "${pids[@]}" &>/dev/null || true' EXIT
+>>>>>>> 44e1ce22abb (fix: some mac install fixes)
 
   # Start Verdaccio in offline mode (no uplinks), bound to all interfaces.
   cat > /tmp/verdaccio-mac-test.yaml <<EOF
@@ -190,13 +195,21 @@ logs: { type: stdout, format: pretty, level: warn }
 EOF
 
   verdaccio --config /tmp/verdaccio-mac-test.yaml --listen 0.0.0.0:$verdaccio_port &>/dev/null &
+<<<<<<< HEAD
   _bg_pids+=($!)
+=======
+  pids+=($!)
+>>>>>>> 44e1ce22abb (fix: some mac install fixes)
   while ! nc -z localhost $verdaccio_port &>/dev/null; do sleep 1; done
   echo "Verdaccio running on 0.0.0.0:$verdaccio_port"
 
   # Serve bin/ directory over HTTP to mimic S3-hosted install scripts.
   python3 -m http.server $http_port --directory ./bin --bind 0.0.0.0 &>/dev/null &
+<<<<<<< HEAD
   _bg_pids+=($!)
+=======
+  pids+=($!)
+>>>>>>> 44e1ce22abb (fix: some mac install fixes)
   while ! nc -z localhost $http_port &>/dev/null; do sleep 1; done
   echo "HTTP server running on 0.0.0.0:$http_port (serving ./bin/)"
 }
@@ -218,24 +231,38 @@ function install_on_mac_vm {
     # Point npm at local Verdaccio and scripts at local HTTP server.
     export npm_config_registry=http://$host_ip:$verdaccio_port
     export INSTALL_URI=http://$host_ip:$http_port
+<<<<<<< HEAD
     export INFRA_VERSION=0.0.1
     export NO_NEW_SHELL=1
+=======
+    export NO_NEW_SHELL=1
+    export NON_INTERACTIVE=1
+>>>>>>> 44e1ce22abb (fix: some mac install fixes)
 
     touch \$HOME/.zshrc
     curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.4/install.sh | bash
     . "\$HOME/.nvm/nvm.sh"
 
     echo
     echo "Running aztec install script..."
+<<<<<<< HEAD
     bash <(curl -sL \$INSTALL_URI/0.0.1/aztec-install)
+=======
+    VERSION=0.0.1 bash <(curl -sL \$INSTALL_URI/0.0.1/aztec-install)
+>>>>>>> 44e1ce22abb (fix: some mac install fixes)
 
     # Fake fresh shell.
     export PATH="\$HOME/.aztec/current/bin:\$HOME/.aztec/current/node_modules/.bin:\$HOME/.aztec/bin:\$PATH"
     . "\$HOME/.nvm/nvm.sh"
 
     # Verify installation.
+<<<<<<< HEAD
     aztec-nargo --version
     aztec-bb --version
+=======
+    nargo --version
+    bb --version
+>>>>>>> 44e1ce22abb (fix: some mac install fixes)
     aztec --version
 REMOTE_EOF
 }
@@ -256,20 +283,29 @@ export -f install_on_mac_vm launch_and_install_on_mac_vm
 
 # Assumes a macos vm is already running.
 # Starts services, and runs install script on the mac vm via ssh.
+<<<<<<< HEAD
 function test_on_mac_vm {
   local mac_name="${1:?Mac vm name (e.g. 14)}"
   echo_header "aztec-up test_on_mac_vm"
+=======
+function test_mac {
+  echo_header "aztec-up test_mac"
+  local mac_name="${1:?Mac vm name (e.g. 14)}"
+>>>>>>> 44e1ce22abb (fix: some mac install fixes)
   prep_test_mac
   install_on_mac_vm $mac_name
 }
 
+<<<<<<< HEAD
 function test_mac {
   local mac_name="${1:?Mac vm name (e.g. 14)}"
   echo_header "aztec-up test_mac"
   prep_test_mac
   launch_and_install_on_mac_vm $mac_name
 }
 
+=======
+>>>>>>> 44e1ce22abb (fix: some mac install fixes)
 # Starts services, launches a mac vm for each version and runs install script via ssh.
 function test_macs {
   echo_header "aztec-up test_macs"

barretenberg/ts/bootstrap.sh

@@ -68,7 +68,7 @@ function release {
 }
 
 function cross_copy {
-  ./scripts/copy_cross.sh
+  ./scripts/copy_cross.sh "$@"
 }
 
 case "$cmd" in

barretenberg/ts/scripts/copy_cross.sh

@@ -5,7 +5,12 @@ NO_CD=1 source $(git rev-parse --show-toplevel)/ci3/source
 
 cd $(dirname $0)/..
 
-if semver check "${REF_NAME:-}" && [[ "$(arch)" == "amd64" ]]; then
+if [ -n "${1:-}" ]; then
+  arch="$1"
+  mkdir -p ./build/$arch
+  cp ../cpp/build-zig-$arch/bin/bb ./build/$arch
+  cp ../cpp/build-zig-$arch/lib/nodejs_module.node ./build/$arch
+elif semver check "${REF_NAME:-}" && [[ "$(arch)" == "amd64" ]]; then
   # We're building a release.
   # We take host build for amd64-linux.
   mkdir -p ./build/amd64-linux

build-images/src/Dockerfile

@@ -203,6 +203,7 @@ RUN apt update && \
         neovim \
         psmisc \
         python3-blessed \
+        qemu-utils \
         redis-tools \
         rsync \
         software-properties-common \
@@ -264,7 +265,7 @@ RUN echo '%sudo ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers
 # It can be used independently:
 # - The user should use the ./run.sh script to launch.
 # - A persistent volume will be mounted to /home/aztec-dev.
-# - It provides docker via the hosts docker instance, mounted at /var/lib/docker.sock.
+# - It provides docker-in-docker.
 # - It uses an entrypoint script at runtime to perform uid/gid alignment with the host and drop into user account.
 FROM basebox AS devbox
 

yarn-project/aztec/scripts/aztec.sh

@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 set -euo pipefail
-shopt -s inherit_errexit
 
 # Re-execute using correct version if we have an .aztecrc file.
 if [ "${AZTEC_VERSIONED:-0}" -eq 0 ] && [ -f .aztecrc ] && command -v aztec-up &>/dev/null; then