chore(ci): reenable arm build (AztecProtocol#6455)

madztheo · May 16, 2024 · 2862767 · 2862767
1 parent b23f1fd
commit 2862767
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/.github/workflows/ci-arm.yml b/.github/workflows/ci-arm.yml
@@ -1,7 +1,7 @@
 name: CI (ARM)
 on:
   push:
-    branches: [disabled] # [master]
+    branches: [master]
   workflow_dispatch:
     inputs: {}
 concurrency:
@@ -20,14 +20,10 @@ jobs:
     needs: setup
     runs-on: master-arm
     steps:
-      - {
-          uses: actions/checkout@v4,
-          with: { ref: "${{ github.event.pull_request.head.sha }}" },
-        }
+      - uses: actions/checkout@v4
+        with: { ref: "${{ github.event.pull_request.head.sha }}" }
       - uses: ./.github/ci-setup-action
         with:
-          dockerhub_password: "${{ secrets.DOCKERHUB_PASSWORD }}"
-          # must be globally unique for build x runner
           concurrency_key: build-master-arm
       # prepare images locally, tagged by commit hash
       - name: "Build E2E Image"
@@ -39,13 +35,10 @@ jobs:
     needs: build
     runs-on: master-arm
     steps:
-      - {
-          uses: actions/checkout@v4,
-          with: { ref: "${{ github.event.pull_request.head.sha }}" },
-        }
+      - uses: actions/checkout@v4
+        with: { ref: "${{ github.event.pull_request.head.sha }}" }
       - uses: ./.github/ci-setup-action
         with:
-          dockerhub_password: "${{ secrets.DOCKERHUB_PASSWORD }}"
           concurrency_key: e2e-master-arm-e2e-tests
       - name: Test
         working-directory: ./yarn-project/end-to-end/

diff --git a/yarn-project/Earthfile b/yarn-project/Earthfile
@@ -100,12 +100,15 @@ anvil:
 
 end-to-end:
     FROM ubuntu:noble
-    RUN apt-get update && apt-get install -y wget gnupg \
+    # add repository for chromium
+    RUN apt-get update && apt-get install -y software-properties-common \
+        && add-apt-repository ppa:xtradeb/apps -y && apt-get update \
+        && apt-get install -y wget gnupg \
         && wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
         && echo "deb [arch=$(dpkg --print-architecture)] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list \
-        && apt update && apt install curl nodejs jq google-chrome-stable netcat-openbsd -y \
+        && apt update && apt install curl chromium nodejs netcat-openbsd -y \
         && rm -rf /var/lib/apt/lists/*
-    ENV CHROME_BIN="/usr/bin/google-chrome-stable"
+    ENV CHROME_BIN="/usr/bin/chromium"
     ENV PATH=/opt/foundry/bin:$PATH
     COPY +anvil/anvil /opt/foundry/bin/anvil
     COPY +end-to-end-prod/usr/src /usr/src