chore: force build

.gitmodules

@@ -1,12 +1,12 @@
 [submodule "build-system"]
 	path = build-system
 	url = [email protected]:AztecProtocol/build-system.git
-[submodule "circuits"]
-	path = circuits
-	url = [email protected]:AztecProtocol/aztec3-circuits.git
 [submodule "l1-contracts"]
 	path = l1-contracts
 	url = [email protected]:AztecProtocol/aztec3-l1-contracts.git
 [submodule "barretenberg"]
-	path = barretenberg
+	path = circuits/cpp/barretenberg
 	url = [email protected]:AztecProtocol/barretenberg.git
+[submodule "legacy-nested-build-system"]
+	path = circuits/build-system
+	url = [email protected]:AztecProtocol/build-system.git

bootstrap.sh

@@ -47,37 +47,9 @@ nvm install
 # Until we push .yarn/cache, we still need to install.
 cd yarn-project
 yarn install --immutable
+# We do not need to build individual packages, yarn build will build the root tsconfig.json
 yarn build
 cd ..
 
-PROJECTS=(
-  "yarn-project/foundation:yarn build"
-  "yarn-project/ethereum.js:yarn build"
-  "yarn-project/l1-contracts:yarn build"
-  "yarn-project/types:yarn build"
-  "yarn-project/merkle-tree:yarn build"
-  "yarn-project/archiver:yarn build"
-  "yarn-project/world-state:yarn build"
-  "yarn-project/p2p:yarn build"
-  "yarn-project/sequencer-client:yarn build"
-  "yarn-project/aztec-node:yarn build"
-  "yarn-project/key-store:yarn build"
-  "yarn-project/acir-simulator:yarn build"
-  "yarn-project/kernel-prover:yarn build"
-  "yarn-project/aztec-rpc:yarn build"
-  "yarn-project/aztec.js:yarn build"
-  "yarn-project/noir-contracts:yarn build"
-)
-
-for E in "${PROJECTS[@]}"; do
-  ARR=(${E//:/ })
-  DIR=${ARR[0]}
-  COMMAND=${ARR[@]:1}
-  echo "Bootstrapping $DIR: $COMMAND"
-  pushd $DIR > /dev/null
-  $COMMAND
-  popd > /dev/null
-done
-
 echo
 echo "Success! You could now run e.g.: ./scripts/tmux-splits e2e_deploy_contract"

build_manifest.sh

@@ -13,7 +13,7 @@
 # commit them, so that the most important build path remains fast and simple.
 
 PROJECTS=(
-  circuits:circuits/cpp:./dockerfiles/Dockerfile.wasm-linux-clang:aztec3-circuits-wasm-linux-clang
+  circuits:circuits/cpp:./dockerfiles/Dockerfile.wasm-linux-clang:circuits-wasm-linux-clang
   yarn-project-base:yarn-project
   # barretenberg.js:yarn-project
   end-to-end:yarn-project