feat: Sync from noir

.circleci/config.yml

@@ -372,6 +372,18 @@ jobs:
           command: build cli-wallet
           aztec_manifest_key: cli-wallet
 
+  end-to-end:
+    machine:
+      image: default
+    resource_class: large
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Build"
+          command: build end-to-end
+          aztec_manifest_key: end-to-end
+
   # For old e2e tests see yarn-project/end-to-end/Earthfile
   # Semantics are similar to Dockerfile
 
@@ -571,6 +583,7 @@ workflows:
             - l1-contracts
             - noir-projects
           <<: *defaults
+      - end-to-end: *defaults_yarn_project
       - yarn-project-x86_64: *defaults_yarn_project_pre_join
       - yarn-project-arm64: *defaults_yarn_project_pre_join
       - yarn-project-ecr-manifest:
@@ -586,6 +599,7 @@ workflows:
       # End to end tests.
       - e2e-join:
           requires:
+            - end-to-end
             - aztec-package
           <<: *defaults
 
@@ -599,4 +613,4 @@ workflows:
             - barretenberg-docs
             - e2e-join
             - cli-wallet
-          <<: *defaults
+          <<: *defaults

.github/ensure-builder/action.yml

@@ -53,7 +53,7 @@ runs:
         ec2_key: ${{ env.BUILD_INSTANCE_SSH_KEY }}
         # idempotency, see https://docs.aws.amazon.com/ec2/latest/devguide/ec2-api-idempotency.html
         # makes e2e tests hitting the API at once not cause multiple spots
-        client_token: ${{ format('ci-yml-{0}-{1}-{2}', inputs.runner_type, env.RUN_ID, env.RUN_ATTEMPT) }}
+        client_token: ${{ format('ci-yml-{0}-{1}', env.RUN_ID, env.RUN_ATTEMPT) }}
         # constants:
         runner_concurrency: ${{ steps.select_instance.outputs.runner_concurrency }}
         ec2_instance_type: ${{ steps.select_instance.outputs.instance_type }}

.github/workflows/ci-arm.yml

@@ -81,9 +81,8 @@ jobs:
           concurrency_key: build-arm
       # prepare images locally, tagged by commit hash
       - name: "Build E2E Image"
-        timeout-minutes: 60
+        timeout-minutes: 40
         run: |
-          sudo shutdown -P 60 # necessary to get around builtin hard timeout
           earthly-ci ./yarn-project+export-e2e-test-images
 
   # all the non-bench end-to-end integration tests for aztec