refactor: remove noir-contracts-build image

.circleci/config.yml

@@ -362,28 +362,6 @@ jobs:
           name: "Build and test"
           command: build l1-contracts
 
-  noir-compiler-build:
-    machine:
-      image: ubuntu-2204:2023.07.2
-    resource_class: large
-    steps:
-      - *checkout
-      - *setup_env
-      - run:
-          name: Build
-          command: build noir-compiler-build | add_timestamps
-
-  noir-contracts-build:
-    machine:
-      image: ubuntu-2204:2023.07.2
-    resource_class: large
-    steps:
-      - *checkout
-      - *setup_env
-      - run:
-          name: Build
-          command: build noir-contracts-build | add_timestamps
-
   yarn-project-base:
     machine:
       image: ubuntu-2204:2023.07.2
@@ -1220,11 +1198,6 @@ workflows:
           <<: *defaults
 
       - l1-contracts: *defaults
-      - noir-compiler-build: *defaults
-      - noir-contracts-build:
-          requires:
-            - noir-compiler-build
-          <<: *defaults
 
       # Yarn Project
       - yarn-project-base:
@@ -1235,7 +1208,6 @@ workflows:
       - yarn-project:
           requires:
             - yarn-project-base
-            - noir-contracts-build
           <<: *defaults
       - yarn-project-formatting:
           requires:

build_manifest.yml

@@ -78,28 +78,6 @@ circuits-x86_64-linux-clang-assert:
 l1-contracts:
   buildDir: l1-contracts
 
-# We should move the noir source code to the top of the repo.
-# It's currently under yarn-project which looks very circular, but it isn't.
-# We're specific with our rebuild patterns as we depend on aztec.nr, but it doesn't have its own build.
-noir-contracts-build:
-  buildDir: yarn-project
-  projectDir: yarn-project/noir-contracts
-  rebuildPatterns:
-    - ^yarn-project/noir-contracts/
-    - ^yarn-project/aztec-nr/
-    - ^yarn-project/noir-compiler/
-  dependencies:
-    - noir-compiler-build
-
-noir-compiler-build:
-  buildDir: yarn-project
-  projectDir: yarn-project/noir-compiler
-  rebuildPatterns:
-    - ^yarn-project/noir-compiler
-    - ^yarn-project/foundation
-  dependencies:
-    - yarn-project-base
-
 yarn-project-base:
   buildDir: yarn-project
   projectDir: yarn-project/yarn-project-base
@@ -113,12 +91,10 @@ yarn-project-base:
 yarn-project:
   buildDir: yarn-project
   rebuildPatterns:
-    - ^yarn-project/.*\.(ts|js|cjs|mjs|json|html|md|sh)$
+    - ^yarn-project/.*\.(ts|js|cjs|mjs|json|html|md|sh|nr)$
     - ^yarn-project/Dockerfile
   dependencies:
     - yarn-project-base
-    - noir-contracts-build
-    - noir-compiler-build
 
 aztec-sandbox:
   buildDir: yarn-project

yarn-project/Dockerfile

@@ -1,16 +1,15 @@
 # This base dockerfile adds all the remaining source files, performs artifact generation, and builds the project.
 # See yarn-project-base/Dockerfile for deeper insight into why things are how they are.
-FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/noir-contracts-build as noir
 FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project-base as builder
 
 # Copy in the entire workspace.
 COPY . .
 
-# Generate Noir contract TypeScript artifacts.
-COPY --from=noir /usr/src/yarn-project/noir-contracts /usr/src/yarn-project/noir-contracts
-
 # Build the entire project.
-RUN yarn tsc -b
+RUN yarn workspace @aztec/foundation build && \
+  yarn workspace @aztec/noir-compiler build && \
+  yarn workspace @aztec/noir-contracts noir:build:all && \
+  yarn tsc -b
 
 # Build aztec.js web artifact
 RUN cd /usr/src/yarn-project/aztec.js && yarn build:web