From 0aeb966428f7695725b0247154ade396e0a7afb1 Mon Sep 17 00:00:00 2001
From: ludamad <adam.domurad@gmail.com>
Date: Thu, 16 May 2024 14:51:40 -0400
Subject: [PATCH 1/3] fix: arm ci

---
 .github/workflows/ci-arm.yml | 53 +++++++++++++++++++++---------------
 1 file changed, 31 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/ci-arm.yml b/.github/workflows/ci-arm.yml
index 1b1f5234ddb..a805a81828b 100644
--- a/.github/workflows/ci-arm.yml
+++ b/.github/workflows/ci-arm.yml
@@ -1,49 +1,58 @@
 name: CI (ARM)
 on:
   push:
-    branches: [master]
+    branches: [ad/test-arm]
   workflow_dispatch:
     inputs: {}
 concurrency:
   # force parallelism in master, cancelling in branches (only relevant to workflow_dispatch)
   group: ci-${{ github.ref_name == 'master' && github.run_id || github.ref_name }}
   cancel-in-progress: true
+env:
+  DOCKERHUB_PASSWORD: "${{ secrets.DOCKERHUB_PASSWORD }}"
+  RUN_ID: ${{ github.run_id }}
+  RUN_ATTEMPT: ${{ github.run_attempt }}
+  USERNAME: ${{ github.event.pull_request.user.login || github.actor }}
+  GITHUB_TOKEN: ${{ github.token }}
+  GH_SELF_HOSTED_RUNNER_TOKEN: ${{ secrets.GH_SELF_HOSTED_RUNNER_TOKEN }}
+  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+  BUILD_INSTANCE_SSH_KEY: ${{ secrets.BUILD_INSTANCE_SSH_KEY }}
+  GIT_COMMIT: ${{ github.sha }}
+  # kludge until we move away from runners
+  WAIT_FOR_RUNNERS: false
 jobs:
-  setup:
-    uses: ./.github/workflows/setup-runner.yml
-    with:
-      username: master
-      runner_type: builder-arm
-    secrets: inherit
-
   build:
-    needs: setup
-    runs-on: master-arm
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with: { ref: "${{ github.event.pull_request.head.sha }}" }
-      - uses: ./.github/ci-setup-action
-        with:
-          concurrency_key: build-master-arm
-      # prepare images locally, tagged by commit hash
       - name: "Build E2E Image"
         timeout-minutes: 40
-        run: earthly-ci ./yarn-project+export-e2e-test-images
+        uses: ./.github/ensure-builder
+        with:
+          runner_type: builder-x86
+          run: |
+            set -eux
+            echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u aztecprotocolci --password-stdin
+            scripts/earthly-ci ./yarn-project+export-e2e-test-images
 
   # all the end-to-end integration tests for aztec
   e2e:
     needs: build
-    runs-on: master-arm
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with: { ref: "${{ github.event.pull_request.head.sha }}" }
-      - uses: ./.github/ci-setup-action
-        with:
-          concurrency_key: e2e-master-arm-e2e-tests
-      - name: Test
-        working-directory: ./yarn-project/end-to-end/
+      - name: "Test"
         timeout-minutes: 15
-        run: earthly-ci -P --no-output +uniswap-trade-on-l1-from-l2
+        uses: ./.github/ensure-builder
+        with:
+          runner_type: builder-x86
+          run: |
+            set -eux
+            echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u aztecprotocolci --password-stdin
+            scripts/earthly-ci -P --no-output ./yarn-project/end-to-end/+uniswap-trade-on-l1-from-l2
 
   notify:
     needs: [e2e]

From 016863f1db0cf4c1e2d6a76b45b0a30572df5731 Mon Sep 17 00:00:00 2001
From: ludamad <adam.domurad@gmail.com>
Date: Thu, 16 May 2024 14:58:07 -0400
Subject: [PATCH 2/3] Update ci-arm.yml

---
 .github/workflows/ci-arm.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci-arm.yml b/.github/workflows/ci-arm.yml
index a805a81828b..cc37f144e31 100644
--- a/.github/workflows/ci-arm.yml
+++ b/.github/workflows/ci-arm.yml
@@ -34,6 +34,7 @@ jobs:
           runner_type: builder-x86
           run: |
             set -eux
+            git submodule update --init --recursive --recommend-shallow
             echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u aztecprotocolci --password-stdin
             scripts/earthly-ci ./yarn-project+export-e2e-test-images
 

From d175ab2e4a287f0e8130907519b6028372c6aaef Mon Sep 17 00:00:00 2001
From: ludamad <adam.domurad@gmail.com>
Date: Fri, 17 May 2024 11:56:00 -0400
Subject: [PATCH 3/3] Update ci-arm.yml

---
 .github/workflows/ci-arm.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci-arm.yml b/.github/workflows/ci-arm.yml
index cc37f144e31..dc5ec576342 100644
--- a/.github/workflows/ci-arm.yml
+++ b/.github/workflows/ci-arm.yml
@@ -1,7 +1,7 @@
 name: CI (ARM)
 on:
   push:
-    branches: [ad/test-arm]
+    branches: [master]
   workflow_dispatch:
     inputs: {}
 concurrency: