From 1b1995a67b4d974a82d0179b29ddee0bbe4a391b Mon Sep 17 00:00:00 2001 From: TomAFrench Date: Thu, 28 Nov 2024 20:18:05 +0000 Subject: [PATCH 1/4] chore(ci): move playwright install to `+deps` --- yarn-project/Earthfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/yarn-project/Earthfile b/yarn-project/Earthfile index 0333fbcec5a..87b3fb1d8f0 100644 --- a/yarn-project/Earthfile +++ b/yarn-project/Earthfile @@ -30,6 +30,9 @@ deps: # by initialising the module more than once. So at present I don't see a viable alternative. RUN ln -s /usr/src/yarn-project/node_modules /usr/src/node_modules + ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true + RUN npx playwright install && npx playwright install-deps + build: # Prefetch targets to not wait for +deps. BUILD ../barretenberg/cpp/+build @@ -49,9 +52,8 @@ build: WORKDIR /usr/src/yarn-project COPY . . - ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true RUN ./bootstrap.sh full - RUN cd ivc-integration && chmod +x run_browser_tests.sh && npx playwright install && npx playwright install-deps + RUN cd ivc-integration && chmod +x run_browser_tests.sh build-dev: From b4c59ebec9db25c2daabf6e30118decae917b9d1 Mon Sep 17 00:00:00 2001 From: TomAFrench Date: Thu, 28 Nov 2024 21:56:44 +0000 Subject: [PATCH 2/4] . --- yarn-project/Earthfile | 1 - 1 file changed, 1 deletion(-) diff --git a/yarn-project/Earthfile b/yarn-project/Earthfile index 87b3fb1d8f0..bd9dabcd312 100644 --- a/yarn-project/Earthfile +++ b/yarn-project/Earthfile @@ -53,7 +53,6 @@ build: WORKDIR /usr/src/yarn-project COPY . . RUN ./bootstrap.sh full - RUN cd ivc-integration && chmod +x run_browser_tests.sh build-dev: From d3595af820d4848b860fdf396423413b6a0030ef Mon Sep 17 00:00:00 2001 From: TomAFrench Date: Thu, 28 Nov 2024 21:58:27 +0000 Subject: [PATCH 3/4] . --- yarn-project/Earthfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/yarn-project/Earthfile b/yarn-project/Earthfile index bd9dabcd312..54079a2ad5f 100644 --- a/yarn-project/Earthfile +++ b/yarn-project/Earthfile @@ -5,6 +5,10 @@ deps: LET packages = $(git ls-files "**/package*.json" package*.json) LET tsconfigs = $(git ls-files "**/tsconfig*.json" tsconfig*.json) FROM ../build-images+from-registry + + ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true + RUN npx playwright install && npx playwright install-deps + # copy bb, bb-js and noir-packages COPY ../barretenberg/cpp/+preset-release/bin /usr/src/barretenberg/cpp/build/bin COPY ../barretenberg/cpp/+preset-release-world-state/bin /usr/src/barretenberg/cpp/build/bin @@ -30,9 +34,6 @@ deps: # by initialising the module more than once. So at present I don't see a viable alternative. RUN ln -s /usr/src/yarn-project/node_modules /usr/src/node_modules - ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true - RUN npx playwright install && npx playwright install-deps - build: # Prefetch targets to not wait for +deps. BUILD ../barretenberg/cpp/+build From 703070380c220fcf502f2a410fd4c070c6d03566 Mon Sep 17 00:00:00 2001 From: Tom French <15848336+TomAFrench@users.noreply.github.com> Date: Mon, 2 Dec 2024 10:32:28 +0000 Subject: [PATCH 4/4] Update Earthfile --- yarn-project/Earthfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yarn-project/Earthfile b/yarn-project/Earthfile index 54079a2ad5f..7fd30660cfd 100644 --- a/yarn-project/Earthfile +++ b/yarn-project/Earthfile @@ -6,7 +6,6 @@ deps: LET tsconfigs = $(git ls-files "**/tsconfig*.json" tsconfig*.json) FROM ../build-images+from-registry - ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true RUN npx playwright install && npx playwright install-deps # copy bb, bb-js and noir-packages @@ -53,6 +52,7 @@ build: WORKDIR /usr/src/yarn-project COPY . . + ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true RUN ./bootstrap.sh full