Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: reinstate docs-preview, fix doc publish #10213

Merged
merged 3 commits into from
Nov 26, 2024
Merged

chore: reinstate docs-preview, fix doc publish #10213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d17e61
chore: reinstate docs-preview
ludamad Nov 26, 2024
f4d837c
Revert "fix: remove src build from doc build flow (#10127)"
ludamad Nov 26, 2024
4000e9f
push doc builds
ludamad Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Expand Down
2 changes: 1 addition & 1 deletion docs/deploy_preview.sh
View file
Open in desktop
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
View file
Open in desktop
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
Loading