From cd8f1fa63a222ad7bc606ae4a505f7ea76796425 Mon Sep 17 00:00:00 2001
From: dbanks12 <david@aztecprotocol.com>
Date: Wed, 12 Jun 2024 17:45:23 +0000
Subject: [PATCH 1/2] chore: add arm64 version of aztec-nargo image

---
 .circleci/config.yml | 62 +++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 56 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4583d493678..2ad94ebeb73 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -231,7 +231,7 @@ jobs:
           command: cond_spot_run_build noir-packages 32
           aztec_manifest_key: noir-packages
 
-  avm-transpiler:
+  avm-transpiler-x86_64:
     docker:
       - image: aztecprotocol/alpine-build-image
     resource_class: small
@@ -243,7 +243,19 @@ jobs:
           command: cond_spot_run_build avm-transpiler 32
           aztec_manifest_key: avm-transpiler
 
-  aztec-nargo:
+  avm-transpiler-arm64:
+    docker:
+      - image: aztecprotocol/alpine-build-image
+    resource_class: small
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Build"
+          command: cond_spot_run_build avm-transpiler 32 arm64
+          aztec_manifest_key: avm-transpiler
+
+  aztec-nargo-x86_64:
     docker:
       - image: aztecprotocol/alpine-build-image
     resource_class: small
@@ -255,6 +267,30 @@ jobs:
           command: cond_spot_run_build aztec-nargo 32
           aztec_manifest_key: aztec-nargo
 
+  aztec-nargo-arm64:
+    docker:
+      - image: aztecprotocol/alpine-build-image
+    resource_class: small
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Build"
+          command: cond_spot_run_build aztec-nargo 32 arm64
+          aztec_manifest_key: aztec-nargo
+
+  aztec-nargo-ecr-manifest:
+    machine:
+      image: default
+    resource_class: medium
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Create ECR manifest"
+          command: create_ecr_manifest aztec-nargo x86_64,arm64
+          aztec_manifest_key: aztec-nargo
+
   l1-contracts:
     machine:
       image: default
@@ -510,15 +546,29 @@ workflows:
           <<: *defaults
 
       # Transpiler
-      - avm-transpiler:
+      - avm-transpiler-x86_64:
           requires:
-            - noir-ecr-manifest
+            - noir-x86_64
+          <<: *defaults
+
+      - avm-transpiler-arm64:
+          requires:
+            - noir-arm64
           <<: *defaults
 
       # aztec-nargo (nargo & transpiler)
-      - aztec-nargo:
+      - aztec-nargo-x86_64:
           requires:
-            - avm-transpiler
+            - avm-transpiler-x86_64
+          <<: *defaults
+      - aztec-nargo-arm64:
+          requires:
+            - avm-transpiler-arm64
+          <<: *defaults
+      - aztec-nargo-ecr-manifest:
+          requires:
+            - aztec-nargo-x86_64
+            - aztec-nargo-arm64
           <<: *defaults
 
       # Barretenberg

From 890946d063ce812870db2735a8107637c9b5a1ac Mon Sep 17 00:00:00 2001
From: dbanks12 <david@aztecprotocol.com>
Date: Wed, 12 Jun 2024 17:49:03 +0000
Subject: [PATCH 2/2] fix

---
 .circleci/config.yml | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2ad94ebeb73..d60dcb3b21b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -255,6 +255,18 @@ jobs:
           command: cond_spot_run_build avm-transpiler 32 arm64
           aztec_manifest_key: avm-transpiler
 
+  avm-transpiler-ecr-manifest:
+    machine:
+      image: default
+    resource_class: medium
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Create ECR manifest"
+          command: create_ecr_manifest avm-transpiler x86_64,arm64
+          aztec_manifest_key: avm-transpiler
+
   aztec-nargo-x86_64:
     docker:
       - image: aztecprotocol/alpine-build-image
@@ -550,11 +562,15 @@ workflows:
           requires:
             - noir-x86_64
           <<: *defaults
-
       - avm-transpiler-arm64:
           requires:
             - noir-arm64
           <<: *defaults
+      - avm-transpiler-ecr-manifest:
+          requires:
+            - avm-transpiler-x86_64
+            - avm-transpiler-arm64
+          <<: *defaults
 
       # aztec-nargo (nargo & transpiler)
       - aztec-nargo-x86_64:
@@ -586,7 +602,7 @@ workflows:
 
       - noir-projects:
           requires:
-            - avm-transpiler
+            - avm-transpiler-ecr-manifest
             - noir-ecr-manifest
           <<: *defaults