From 3d17e6146fe2c7df672e72cb6d70f478a465e043 Mon Sep 17 00:00:00 2001 From: ludamad Date: Tue, 26 Nov 2024 11:32:15 -0500 Subject: [PATCH 1/3] chore: reinstate docs-preview This has been disabled for months and now something has broken on publish --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 45837c1954d4..4b20418339b5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -780,7 +780,6 @@ jobs: with: concurrency_key: docs-preview-x86 - name: "Docs Preview" - if: github.event.number timeout-minutes: 40 run: | earthly-ci --no-output \ From f4d837c99cf29994eb1b5bb5a59ef43f81c7fbb5 Mon Sep 17 00:00:00 2001 From: ludamad Date: Tue, 26 Nov 2024 17:07:10 +0000 Subject: [PATCH 2/3] Revert "fix: remove src build from doc build flow (#10127)" This reverts commit fbfe1b113ab8d870f9a72401c07202265aecd7a7. --- docs/Earthfile | 4 ++-- docs/deploy_preview.sh | 2 +- yarn-project/Earthfile | 9 +++------ 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/docs/Earthfile b/docs/Earthfile index de42389b1edc..17986c9ff003 100644 --- a/docs/Earthfile +++ b/docs/Earthfile @@ -37,14 +37,14 @@ serve: deploy-preview: - BUILD ../yarn-project/+scripts-preview + BUILD ../yarn-project/+scripts-prod ARG ENV ARG NETLIFY_AUTH_TOKEN ARG NETLIFY_SITE_ID ARG AZTEC_BOT_COMMENTER_GITHUB_TOKEN ARG PR FROM +serve - COPY --dir ../yarn-project/+scripts-preview/usr/src/yarn-project /usr/src + COPY --dir ../yarn-project/+scripts-prod/usr/src/yarn-project /usr/src COPY ./netlify.toml . COPY ./deploy_preview.sh . RUN NETLIFY_AUTH_TOKEN=$NETLIFY_AUTH_TOKEN NETLIFY_SITE_ID=$NETLIFY_SITE_ID ./deploy_preview.sh $PR $AZTEC_BOT_COMMENTER_GITHUB_TOKEN diff --git a/docs/deploy_preview.sh b/docs/deploy_preview.sh index 3f6ea1785d6e..74091495fd0c 100755 --- a/docs/deploy_preview.sh +++ b/docs/deploy_preview.sh @@ -26,4 +26,4 @@ DOCS_PREVIEW_URL=$(echo "$DEPLOY_OUTPUT" | grep -E "https://.*aztec-docs-dev.net echo "Unique deploy URL: $DOCS_PREVIEW_URL" cd ../yarn-project/scripts -AZTEC_BOT_COMMENTER_GITHUB_TOKEN=$AZTEC_BOT_COMMENTER_GITHUB_TOKEN PR_NUMBER=$PR_NUMBER DOCS_PREVIEW_URL=$DOCS_PREVIEW_URL yarn docs-preview-comment +AZTEC_BOT_COMMENTER_GITHUB_TOKEN=$AZTEC_BOT_COMMENTER_GITHUB_TOKEN PR_NUMBER=$PR_NUMBER DOCS_PREVIEW_URL=$DOCS_PREVIEW_URL yarn docs-preview-comment diff --git a/yarn-project/Earthfile b/yarn-project/Earthfile index 469083c22cfb..0333fbcec5a9 100644 --- a/yarn-project/Earthfile +++ b/yarn-project/Earthfile @@ -37,6 +37,7 @@ build: BUILD ../noir/+nargo BUILD --pass-args ../noir-projects/+build BUILD ../l1-contracts/+build + BUILD ../barretenberg/ts/+build BUILD ../noir/+packages FROM +deps @@ -52,6 +53,7 @@ build: RUN ./bootstrap.sh full RUN cd ivc-integration && chmod +x run_browser_tests.sh && npx playwright install && npx playwright install-deps + build-dev: FROM +build SAVE ARTIFACT /usr/src /usr/src @@ -241,13 +243,8 @@ end-to-end: WORKDIR /usr/src/yarn-project/end-to-end ENTRYPOINT ["yarn", "test"] -scripts-preview: - FROM +build - RUN yarn workspaces focus @aztec/scripts --production && yarn cache clean - SAVE ARTIFACT /usr/src /usr/src - scripts-prod: - FROM +deps + FROM +build RUN yarn workspaces focus @aztec/scripts --production && yarn cache clean SAVE ARTIFACT /usr/src /usr/src From 4000e9f2bccf8d2b307d10760049e4f63b1cba5a Mon Sep 17 00:00:00 2001 From: ludamad Date: Tue, 26 Nov 2024 17:07:40 +0000 Subject: [PATCH 3/3] push doc builds --- .github/workflows/ci.yml | 2 +- .github/workflows/publish-docs.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4b20418339b5..5f4095c671fe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -780,7 +780,7 @@ jobs: with: concurrency_key: docs-preview-x86 - name: "Docs Preview" - timeout-minutes: 40 + timeout-minutes: 60 run: | earthly-ci --no-output \ ./docs/+deploy-preview --ENV=staging --PR=${{ github.event.number }} \ diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml index b1cca0a9b8ff..c6583ec45ded 100644 --- a/.github/workflows/publish-docs.yml +++ b/.github/workflows/publish-docs.yml @@ -29,7 +29,7 @@ jobs: with: concurrency_key: docs-preview-${{ inputs.username || github.actor }}-x86 - - timeout-minutes: 25 + - timeout-minutes: 60 # in case of full build run: | earthly-ci --no-output ./docs/+deploy-prod \ --NETLIFY_AUTH_TOKEN=${{ secrets.NETLIFY_AUTH_TOKEN }} \