diff --git a/.github/workflows/docs-deploy.yml b/.github/workflows/docs-typesense.yml similarity index 58% rename from .github/workflows/docs-deploy.yml rename to .github/workflows/docs-typesense.yml index 79c90f8e3e24..f6ae1bd2ad3b 100644 --- a/.github/workflows/docs-deploy.yml +++ b/.github/workflows/docs-typesense.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/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 19d18b6ac2ac..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=1 $project/bootstrap.sh done - name: Query new version diff --git a/bootstrap.sh b/bootstrap.sh index 579f6c46d525..ca04d6709b66 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 + docs/bootstrap.sh release-docs + fi ;; test|test_cmds|bench|release|release_dryrun) $cmd "$@" diff --git a/docs/bootstrap.sh b/docs/bootstrap.sh index cb5bca858326..c562c102dff4 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 2>&1); then - echo "Netlify deploy failed with error:" - echo "$deploy_output" - exit 1 - fi + yarn netlify deploy --site aztec-docs-dev --prod 2>&1 } case "$cmd" in @@ -54,7 +50,7 @@ case "$cmd" in "hash") echo "$hash" ;; - "release") + "release-docs") release_docs ;; *)