Skip to content

Commit

Permalink
chore: reinstate docs-preview, fix doc publish (#10213)
Browse files Browse the repository at this point in the history
This has been disabled for months and now something has broken on
publish
Reverts steven's attempt fix, bumps timeout instead
  • Loading branch information
ludamad authored Nov 26, 2024
1 parent ac8f13e commit ed9a0e3
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 12 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -780,8 +780,7 @@ jobs:
with:
concurrency_key: docs-preview-x86
- name: "Docs Preview"
if: github.event.number
timeout-minutes: 40
timeout-minutes: 60
run: |
earthly-ci --no-output \
./docs/+deploy-preview --ENV=staging --PR=${{ github.event.number }} \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }} \
Expand Down
4 changes: 2 additions & 2 deletions docs/Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Check failure on line 50 in docs/Earthfile

View workflow job for this annotation

GitHub Actions / docs-preview

Error

The command RUN NETLIFY_AUTH_TOKEN=$NETLIFY_AUTH_TOKEN NETLIFY_SITE_ID=$NETLIFY_SITE_ID ./deploy_preview.sh $PR $AZTEC_BOT_COMMENTER_GITHUB_TOKEN did not complete successfully. Exit code 1
Expand Down
2 changes: 1 addition & 1 deletion docs/deploy_preview.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 3 additions & 6 deletions yarn-project/Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit ed9a0e3

Please sign in to comment.