From bc8e4967bb3485e98acc3d12275c29a73de18769 Mon Sep 17 00:00:00 2001 From: TomAFrench Date: Tue, 25 Jun 2024 10:44:01 +0000 Subject: [PATCH 1/4] chore(ci): add new e2e base target --- yarn-project/Earthfile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/yarn-project/Earthfile b/yarn-project/Earthfile index 82f52d6e6ebc..5d20ae29ad69 100644 --- a/yarn-project/Earthfile +++ b/yarn-project/Earthfile @@ -202,7 +202,7 @@ anvil: FROM ../build-images+build SAVE ARTIFACT /opt/foundry/bin/anvil -end-to-end: +end-to-end-base: FROM ubuntu:noble # add repository for chromium RUN apt-get update && apt-get install -y software-properties-common \ @@ -220,11 +220,16 @@ end-to-end: ENV ACVM_WORKING_DIRECTORY=/usr/src/acvm ENV ACVM_BINARY_PATH=/usr/src/noir/noir-repo/target/release/acvm ENV PROVER_AGENT_CONCURRENCY=8 - RUN mkdir -p $BB_WORKING_DIRECTORY $ACVM_WORKING_DIRECTORY + RUN mkdir -p $BB_WORKING_DIRECTORY $ + + RUN ln -s /usr/src/yarn-project/.yarn/releases/yarn-3.6.3.cjs /usr/local/bin/yarn + +end-to-end: + FROM +end-to-end-base + COPY +anvil/anvil /opt/foundry/bin/anvil COPY +end-to-end-prod/usr/src /usr/src WORKDIR /usr/src/yarn-project/end-to-end - RUN ln -s /usr/src/yarn-project/.yarn/releases/yarn-3.6.3.cjs /usr/local/bin/yarn ENTRYPOINT ["yarn", "test"] scripts-prod: From bd6ad4426a328e72276c8d3614f47c230b8c4285 Mon Sep 17 00:00:00 2001 From: TomAFrench Date: Tue, 25 Jun 2024 11:21:00 +0000 Subject: [PATCH 2/4] chore: split off initial install from chromium install --- yarn-project/Earthfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yarn-project/Earthfile b/yarn-project/Earthfile index 5d20ae29ad69..b9cf3a9ae518 100644 --- a/yarn-project/Earthfile +++ b/yarn-project/Earthfile @@ -208,7 +208,8 @@ end-to-end-base: 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 - \ + && rm -rf /var/lib/apt/lists/* + RUN 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 \ && rm -rf /var/lib/apt/lists/* From 27b783d644333ba31ce345016b4314535ac8e446 Mon Sep 17 00:00:00 2001 From: Tom French <15848336+TomAFrench@users.noreply.github.com> Date: Tue, 25 Jun 2024 13:08:36 +0100 Subject: [PATCH 3/4] Update yarn-project/Earthfile --- yarn-project/Earthfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yarn-project/Earthfile b/yarn-project/Earthfile index b9cf3a9ae518..2391a46cb4d3 100644 --- a/yarn-project/Earthfile +++ b/yarn-project/Earthfile @@ -221,7 +221,7 @@ end-to-end-base: ENV ACVM_WORKING_DIRECTORY=/usr/src/acvm ENV ACVM_BINARY_PATH=/usr/src/noir/noir-repo/target/release/acvm ENV PROVER_AGENT_CONCURRENCY=8 - RUN mkdir -p $BB_WORKING_DIRECTORY $ + RUN mkdir -p $BB_WORKING_DIRECTORY $ACVM_WORKING_DIRECTORY RUN ln -s /usr/src/yarn-project/.yarn/releases/yarn-3.6.3.cjs /usr/local/bin/yarn From 05ae94ca3d19b270c6c35010e148eb2ecb5d9473 Mon Sep 17 00:00:00 2001 From: Tom French <15848336+TomAFrench@users.noreply.github.com> Date: Tue, 25 Jun 2024 13:10:30 +0100 Subject: [PATCH 4/4] Update yarn-project/Earthfile --- yarn-project/Earthfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/yarn-project/Earthfile b/yarn-project/Earthfile index 2391a46cb4d3..1f4e2fdc7906 100644 --- a/yarn-project/Earthfile +++ b/yarn-project/Earthfile @@ -208,8 +208,7 @@ end-to-end-base: 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 \ - && rm -rf /var/lib/apt/lists/* - RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \ + && 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 \ && rm -rf /var/lib/apt/lists/*