From 3682a542c912035bd6856251c04a8a3641a76e5e Mon Sep 17 00:00:00 2001 From: signorecello Date: Tue, 22 Apr 2025 11:56:04 +0000 Subject: [PATCH 1/8] chore(docs): bugfix + deploy on master --- .github/workflows/release-please.yml | 2 +- bootstrap.sh | 4 ++++ docs/bootstrap.sh | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 19d18b6ac2ac..94d2596d5968 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -54,7 +54,7 @@ jobs: - name: Build dependencies run: | for project in noir barretenberg l1-contracts yarn-project; do - $project/bootstrap.sh + $project/bootstrap.sh ci done - name: Query new version diff --git a/bootstrap.sh b/bootstrap.sh index 579f6c46d525..101f92ef69ac 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -341,6 +341,10 @@ case "$cmd" in echo_stderr -e "${yellow}Not testing or benching $REF_NAME because it is a release tag.${reset}" fi fi + + if [ "$REF_NAME" = "master" ]; then + release-docs + fi ;; test|test_cmds|bench|release|release_dryrun) $cmd "$@" diff --git a/docs/bootstrap.sh b/docs/bootstrap.sh index cb5bca858326..313f84bc70b4 100755 --- a/docs/bootstrap.sh +++ b/docs/bootstrap.sh @@ -37,7 +37,7 @@ function release_docs { yarn install yarn build - if ! deploy_output=$(yarn netlify deploy --site aztec-docs-dev --prod 2>&1); then + if ! deploy_output=$(yarn netlify deploy --site aztec-docs-dev --prod); then echo "Netlify deploy failed with error:" echo "$deploy_output" exit 1 @@ -54,7 +54,7 @@ case "$cmd" in "hash") echo "$hash" ;; - "release") + "release-docs") release_docs ;; *) From cbb99da6b1e46e7d736db680d2b306e678c49c5d Mon Sep 17 00:00:00 2001 From: signorecello Date: Tue, 22 Apr 2025 12:38:35 +0000 Subject: [PATCH 2/8] adding spyros review --- bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap.sh b/bootstrap.sh index 101f92ef69ac..ca04d6709b66 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -343,7 +343,7 @@ case "$cmd" in fi if [ "$REF_NAME" = "master" ]; then - release-docs + docs/bootstrap.sh release-docs fi ;; test|test_cmds|bench|release|release_dryrun) From f088a6762231aae672289faee6591b19c6ea688e Mon Sep 17 00:00:00 2001 From: signorecello Date: Tue, 22 Apr 2025 13:32:35 +0000 Subject: [PATCH 3/8] removing deploy action, making netlify always output --- .github/workflows/docs-deploy.yml | 28 ++-------------------------- docs/bootstrap.sh | 6 +----- 2 files changed, 3 insertions(+), 31 deletions(-) diff --git a/.github/workflows/docs-deploy.yml b/.github/workflows/docs-deploy.yml index 79c90f8e3e24..f6ae1bd2ad3b 100644 --- a/.github/workflows/docs-deploy.yml +++ b/.github/workflows/docs-deploy.yml @@ -1,4 +1,4 @@ -name: Docs Deploy +name: Docs Scraper on: workflow_dispatch: @@ -9,7 +9,7 @@ on: - docs/** jobs: - docs-pr: + docs-scraper: runs-on: ubuntu-latest env: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} @@ -23,30 +23,6 @@ jobs: with: fetch-depth: 0 - - name: Set up Node.js - uses: actions/setup-node@v3 - with: - node-version: "18" - - - name: Enable Corepack - run: corepack enable - - - name: Configure Git - run: | - git config --global user.name AztecBot - git config --global user.email tech@aztecprotocol.com - - - name: Build dependencies - run: | - for project in noir barretenberg l1-contracts yarn-project; do - $project/bootstrap.sh - done - - # Making the bash script here so we don't accidentally deploy - - name: Deploy docs - run: | - ./docs/bootstrap.sh release - - name: Reindex with Typesense docsearch-scraper run: | docker run \ diff --git a/docs/bootstrap.sh b/docs/bootstrap.sh index 313f84bc70b4..8f900bfcb83c 100755 --- a/docs/bootstrap.sh +++ b/docs/bootstrap.sh @@ -37,11 +37,7 @@ function release_docs { yarn install yarn build - if ! deploy_output=$(yarn netlify deploy --site aztec-docs-dev --prod); then - echo "Netlify deploy failed with error:" - echo "$deploy_output" - exit 1 - fi + yarn netlify deploy --site aztec-docs-dev --prod } case "$cmd" in From 30c421a8cae59111917873a842267877a6e1b039 Mon Sep 17 00:00:00 2001 From: signorecello Date: Tue, 22 Apr 2025 15:56:11 +0000 Subject: [PATCH 4/8] rename --- .github/workflows/{docs-deploy.yml => docs-typesense.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{docs-deploy.yml => docs-typesense.yml} (100%) diff --git a/.github/workflows/docs-deploy.yml b/.github/workflows/docs-typesense.yml similarity index 100% rename from .github/workflows/docs-deploy.yml rename to .github/workflows/docs-typesense.yml From dd4e2ccf7296cd7a54029b389d564717b957a16f Mon Sep 17 00:00:00 2001 From: signorecello Date: Tue, 22 Apr 2025 16:15:18 +0000 Subject: [PATCH 5/8] echoing the output so josh can sleep at night --- docs/bootstrap.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/bootstrap.sh b/docs/bootstrap.sh index 8f900bfcb83c..44679f1fcabb 100755 --- a/docs/bootstrap.sh +++ b/docs/bootstrap.sh @@ -37,7 +37,8 @@ function release_docs { yarn install yarn build - yarn netlify deploy --site aztec-docs-dev --prod + deploy_output=$(yarn netlify deploy --site aztec-docs-dev --prod 2>&1) + echo "$deploy_output" } case "$cmd" in From 0af1b4fab56ff4aa01b3b2d58b1156b8ea9429d6 Mon Sep 17 00:00:00 2001 From: Maddiaa <47148561+Maddiaa0@users.noreply.github.com> Date: Tue, 22 Apr 2025 19:50:15 +0100 Subject: [PATCH 6/8] Update .github/workflows/release-please.yml --- .github/workflows/release-please.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 94d2596d5968..5cb0b3f9e1ce 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -54,7 +54,7 @@ jobs: - name: Build dependencies run: | for project in noir barretenberg l1-contracts yarn-project; do - $project/bootstrap.sh ci + CI=1 $project/bootstrap.sh done - name: Query new version From 92199958da238c329f03ed1dc9b35de1f251ea8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Pedro=20Sousa?= Date: Wed, 23 Apr 2025 10:31:06 +0100 Subject: [PATCH 7/8] Update docs/bootstrap.sh Co-authored-by: Maddiaa <47148561+Maddiaa0@users.noreply.github.com> --- docs/bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/bootstrap.sh b/docs/bootstrap.sh index 44679f1fcabb..2001823478db 100755 --- a/docs/bootstrap.sh +++ b/docs/bootstrap.sh @@ -37,7 +37,7 @@ function release_docs { yarn install yarn build - deploy_output=$(yarn netlify deploy --site aztec-docs-dev --prod 2>&1) +yarn netlify deploy --site aztec-docs-dev --prod 2>&1 echo "$deploy_output" } From 7b9dc2ee227281b8bdb49335f5e3f393f9505401 Mon Sep 17 00:00:00 2001 From: Maddiaa <47148561+Maddiaa0@users.noreply.github.com> Date: Wed, 23 Apr 2025 10:57:15 +0100 Subject: [PATCH 8/8] Update docs/bootstrap.sh --- docs/bootstrap.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/bootstrap.sh b/docs/bootstrap.sh index 2001823478db..c562c102dff4 100755 --- a/docs/bootstrap.sh +++ b/docs/bootstrap.sh @@ -37,8 +37,7 @@ function release_docs { yarn install yarn build -yarn netlify deploy --site aztec-docs-dev --prod 2>&1 - echo "$deploy_output" + yarn netlify deploy --site aztec-docs-dev --prod 2>&1 } case "$cmd" in