From 11b92be64e16433edd24f021288d35c8f275c588 Mon Sep 17 00:00:00 2001 From: ludamad Date: Thu, 16 May 2024 06:30:33 -0400 Subject: [PATCH 1/9] chore(ci): reenable arm build --- .github/workflows/ci-arm.yml | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/.github/workflows/ci-arm.yml b/.github/workflows/ci-arm.yml index de68cd282101..b8ee40a08ee9 100644 --- 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: [ad/reenable-arm-ci] # [master] workflow_dispatch: inputs: {} concurrency: @@ -16,40 +16,19 @@ jobs: runner_type: builder-arm secrets: inherit - build: - needs: setup - runs-on: master-arm - steps: - - { - 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" - timeout-minutes: 40 - run: earthly-ci ./yarn-project+export-e2e-test-images - # all the end-to-end integration tests for aztec e2e: - needs: build + 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 }}" concurrency_key: e2e-master-arm-e2e-tests - name: Test working-directory: ./yarn-project/end-to-end/ - timeout-minutes: 15 + timeout-minutes: 40 run: earthly-ci -P --no-output +uniswap-trade-on-l1-from-l2 notify: From 11b0395e5ae212cb89b97346a675906d563ea0b7 Mon Sep 17 00:00:00 2001 From: ludamad Date: Thu, 16 May 2024 06:43:19 -0400 Subject: [PATCH 2/9] 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 b8ee40a08ee9..ec70309c3b34 100644 --- a/.github/workflows/ci-arm.yml +++ b/.github/workflows/ci-arm.yml @@ -21,7 +21,7 @@ jobs: needs: setup runs-on: master-arm steps: - - uses: actions/checkout@v4, + - uses: actions/checkout@v4 with: { ref: "${{ github.event.pull_request.head.sha }}" } - uses: ./.github/ci-setup-action with: From 2af8da2196e38d613d6cd4b48442aca903c97267 Mon Sep 17 00:00:00 2001 From: ludamad Date: Thu, 16 May 2024 11:31:06 +0000 Subject: [PATCH 3/9] use chromium --- yarn-project/Earthfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/yarn-project/Earthfile b/yarn-project/Earthfile index 8679843e0467..a1e9e97f86e2 100644 --- a/yarn-project/Earthfile +++ b/yarn-project/Earthfile @@ -100,12 +100,14 @@ anvil: end-to-end: FROM ubuntu:noble - RUN apt-get update && apt-get install -y wget gnupg \ + # add repository for chromium + RUN 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 From 8d605d9e5d18e10fa9d32b164643b0cfb0c66cca Mon Sep 17 00:00:00 2001 From: ludamad Date: Thu, 16 May 2024 07:36:40 -0400 Subject: [PATCH 4/9] revert --- .github/workflows/ci-arm.yml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-arm.yml b/.github/workflows/ci-arm.yml index ec70309c3b34..0c10f0443338 100644 --- a/.github/workflows/ci-arm.yml +++ b/.github/workflows/ci-arm.yml @@ -16,9 +16,23 @@ jobs: runner_type: builder-arm secrets: inherit + build: + needs: setup + runs-on: master-arm + 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 + # all the end-to-end integration tests for aztec e2e: - needs: setup + needs: build runs-on: master-arm steps: - uses: actions/checkout@v4 @@ -28,7 +42,7 @@ jobs: concurrency_key: e2e-master-arm-e2e-tests - name: Test working-directory: ./yarn-project/end-to-end/ - timeout-minutes: 40 + timeout-minutes: 15 run: earthly-ci -P --no-output +uniswap-trade-on-l1-from-l2 notify: From 562e65bf0045a95d5f19265eccd6a9feb256b487 Mon Sep 17 00:00:00 2001 From: ludamad Date: Thu, 16 May 2024 07:37:00 -0400 Subject: [PATCH 5/9] Update Earthfile --- yarn-project/Earthfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yarn-project/Earthfile b/yarn-project/Earthfile index a1e9e97f86e2..9463add1e1d1 100644 --- a/yarn-project/Earthfile +++ b/yarn-project/Earthfile @@ -105,7 +105,7 @@ end-to-end: 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 chromium nodejs netcat-openbsd -y + && apt update && apt install curl chromium nodejs netcat-openbsd -y \ && rm -rf /var/lib/apt/lists/* ENV CHROME_BIN="/usr/bin/chromium" ENV PATH=/opt/foundry/bin:$PATH From fb266800229b92e19bfa9d3352040416ab0d8499 Mon Sep 17 00:00:00 2001 From: ludamad Date: Thu, 16 May 2024 07:42:18 -0400 Subject: [PATCH 6/9] install add-apt-repository --- build-images/Earthfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-images/Earthfile b/build-images/Earthfile index c282459712b7..9f2a1356d9c3 100644 --- a/build-images/Earthfile +++ b/build-images/Earthfile @@ -141,6 +141,8 @@ build: # Python (clang bindings for wasm bindgen.) python3 \ python3-clang \ + # For add-apt-repository + software-properties-common \ && apt-get -y autoremove \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* From 341d3499bcb434d675ddaf2a32742ce7a3143183 Mon Sep 17 00:00:00 2001 From: ludamad Date: Thu, 16 May 2024 08:08:21 -0400 Subject: [PATCH 7/9] Update Earthfile --- yarn-project/Earthfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/yarn-project/Earthfile b/yarn-project/Earthfile index 9463add1e1d1..7a41726cf283 100644 --- a/yarn-project/Earthfile +++ b/yarn-project/Earthfile @@ -101,8 +101,9 @@ anvil: end-to-end: FROM ubuntu:noble # add repository for chromium - RUN add-apt-repository ppa:xtradeb/apps -y && \ - apt-get update && apt-get install -y wget gnupg \ + 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 chromium nodejs netcat-openbsd -y \ From 705f59b24aba518665d1f7e7cf1ff4ab105f07f6 Mon Sep 17 00:00:00 2001 From: ludamad Date: Thu, 16 May 2024 08:08:43 -0400 Subject: [PATCH 8/9] Update Earthfile --- build-images/Earthfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/build-images/Earthfile b/build-images/Earthfile index 9f2a1356d9c3..c282459712b7 100644 --- a/build-images/Earthfile +++ b/build-images/Earthfile @@ -141,8 +141,6 @@ build: # Python (clang bindings for wasm bindgen.) python3 \ python3-clang \ - # For add-apt-repository - software-properties-common \ && apt-get -y autoremove \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* From 3931cfeb12f46447c62f8f5ef5a4a87784ea17f7 Mon Sep 17 00:00:00 2001 From: ludamad Date: Thu, 16 May 2024 08:47:52 -0400 Subject: [PATCH 9/9] 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 0c10f0443338..1b1f5234ddb4 100644 --- a/.github/workflows/ci-arm.yml +++ b/.github/workflows/ci-arm.yml @@ -1,7 +1,7 @@ name: CI (ARM) on: push: - branches: [ad/reenable-arm-ci] # [master] + branches: [master] workflow_dispatch: inputs: {} concurrency: