From 3ea5ffa5a743fbf213cf22824fb0165bea69e6fe Mon Sep 17 00:00:00 2001
From: spypsy <spypsy@outlook.com>
Date: Thu, 13 Jun 2024 12:58:48 +0000
Subject: [PATCH 1/3] fix: CCI issues

---
 .circleci/config.yml                  | 5 +++--
 build-system/scripts/deploy_terraform | 2 ++
 build_manifest.yml                    | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d60dcb3b21b..4c53d5a1592 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -477,8 +477,9 @@ jobs:
       - run:
           name: "Update aztec-up"
           command: |
-            should_release || exit 0
-            deploy_terraform "" aztec-up/terraform
+            if [ -n "$DEPLOY_TAG" ]; then
+              deploy_terraform "" aztec-up/terraform
+            fi
 
 # Repeatable config for defining the workflow below.
 defaults: &defaults
diff --git a/build-system/scripts/deploy_terraform b/build-system/scripts/deploy_terraform
index 5418073ba28..5312bdec1d7 100755
--- a/build-system/scripts/deploy_terraform
+++ b/build-system/scripts/deploy_terraform
@@ -36,6 +36,8 @@ export TF_VAR_CHAIN_ID=$CHAIN_ID
 if [ -n "$REPOSITORY" ]; then
   BACKEND_CONFIG=-backend-config="key=$DEPLOY_TAG/$REPOSITORY"
   echo "Using backend key $DEPLOY_TAG/$REPOSITORY"
+else
+  BACKEND_CONFIG=""
 fi
 
 terraform init -input=false $BACKEND_CONFIG
diff --git a/build_manifest.yml b/build_manifest.yml
index e0f6d26397e..7c3e6543afa 100644
--- a/build_manifest.yml
+++ b/build_manifest.yml
@@ -50,6 +50,7 @@ avm-transpiler:
     - ^noir/
   dependencies:
     - noir
+  multiarch: host
 
 aztec-nargo:
   buildDir: .

From a510a727e1db2e5f8e5f63f04a8219c7fb8247da Mon Sep 17 00:00:00 2001
From: spypsy <spypsy@outlook.com>
Date: Thu, 13 Jun 2024 13:02:32 +0000
Subject: [PATCH 2/3] use COMMIT_TAG

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4c53d5a1592..8c30b5c8b68 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -477,7 +477,7 @@ jobs:
       - run:
           name: "Update aztec-up"
           command: |
-            if [ -n "$DEPLOY_TAG" ]; then
+            if [ -n "$COMMIT_TAG" ]; then
               deploy_terraform "" aztec-up/terraform
             fi
 

From be9d30ab141bbe34e73acf8f40bfb65d15278c87 Mon Sep 17 00:00:00 2001
From: spypsy <spypsy@outlook.com>
Date: Thu, 13 Jun 2024 13:05:21 +0000
Subject: [PATCH 3/3] un-revert

---
 .circleci/config.yml | 82 +++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 74 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c7fdd415bfb..754459433b3 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,31 @@ 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
+
+  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
     resource_class: small
@@ -255,6 +279,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
@@ -511,15 +559,33 @@ workflows:
           <<: *defaults
 
       # Transpiler
-      - avm-transpiler:
+      - avm-transpiler-x86_64:
           requires:
-            - noir-ecr-manifest
+            - 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:
+      - aztec-nargo-x86_64:
+          requires:
+            - avm-transpiler-x86_64
+          <<: *defaults
+      - aztec-nargo-arm64:
+          requires:
+            - avm-transpiler-arm64
+          <<: *defaults
+      - aztec-nargo-ecr-manifest:
           requires:
-            - avm-transpiler
+            - aztec-nargo-x86_64
+            - aztec-nargo-arm64
           <<: *defaults
 
       # Barretenberg
@@ -537,7 +603,7 @@ workflows:
 
       - noir-projects:
           requires:
-            - avm-transpiler
+            - avm-transpiler-ecr-manifest
             - noir-ecr-manifest
           <<: *defaults
 
@@ -582,4 +648,4 @@ workflows:
           <<: *defaults
 
       # Production releases.
-      - deploy-and-release: *defaults_deploy
+      - deploy-and-release: *defaults_deploy
\ No newline at end of file