Merge branch 'master' into 05-29-refactor_remove_prover-pool

.circleci/config.yml

@@ -243,6 +243,18 @@ jobs:
           command: cond_spot_run_build avm-transpiler 32
           aztec_manifest_key: avm-transpiler
 
+  aztec-nargo:
+    docker:
+      - image: aztecprotocol/alpine-build-image
+    resource_class: small
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Build"
+          command: cond_spot_run_build aztec-nargo 32
+          aztec_manifest_key: aztec-nargo
+
   l1-contracts:
     machine:
       image: default
@@ -381,7 +393,7 @@ jobs:
           name: "Release to dockerhub"
           command: |
             should_release || exit 0
-            deploy_dockerhub noir
+            deploy_dockerhub aztec-nargo
             deploy_dockerhub aztec
             deploy_dockerhub aztec-builder
       - run:
@@ -473,8 +485,10 @@ workflows:
     #   # This is rewritten to 'system' on the real workflow (otherwise this is ignored by circleci)
     #   equal: [NEVER, << pipeline.parameters.workflow >>]
     when:
-      and:
+      # Run if branch is master or branch name contains 'circle-ci'
+      or:
         - equal: [ master, << pipeline.git.branch >> ]
+        - matches: { pattern: ".*circle-ci.*", value: << pipeline.git.branch >> }
     jobs:
       # Noir
       - noir-x86_64: *defaults
@@ -490,7 +504,16 @@ workflows:
           <<: *defaults
 
       # Transpiler
-      - avm-transpiler: *defaults
+      - avm-transpiler:
+          requires:
+            - noir-ecr-manifest
+          <<: *defaults
+
+      # aztec-nargo (nargo & transpiler)
+      - aztec-nargo:
+          requires:
+            - avm-transpiler
+          <<: *defaults
 
       # Barretenberg
       - barretenberg-x86_64-linux-clang: *defaults