From b5e5718857a2780dd6593a4de4ac11906796e95d Mon Sep 17 00:00:00 2001 From: Tom French Date: Fri, 24 Nov 2023 12:05:51 +0000 Subject: [PATCH 1/4] chore: add dependency on noir_js from docs package --- docs/package.json | 1 + yarn.lock | 1 + 2 files changed, 2 insertions(+) diff --git a/docs/package.json b/docs/package.json index 09f8d718b56..db0efbe7543 100644 --- a/docs/package.json +++ b/docs/package.json @@ -13,6 +13,7 @@ "@docusaurus/preset-classic": "^2.4.0", "@easyops-cn/docusaurus-search-local": "^0.35.0", "@mdx-js/react": "^1.6.22", + "@noir-lang/noir_js": "workspace:*", "axios": "^1.4.0", "clsx": "^1.2.1", "docusaurus-plugin-typedoc": "1.0.0-next.18", diff --git a/yarn.lock b/yarn.lock index 9c6a447d718..6ae655f8ce2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8290,6 +8290,7 @@ __metadata: "@docusaurus/preset-classic": ^2.4.0 "@easyops-cn/docusaurus-search-local": ^0.35.0 "@mdx-js/react": ^1.6.22 + "@noir-lang/noir_js": "workspace:*" axios: ^1.4.0 clsx: ^1.2.1 docusaurus-plugin-typedoc: 1.0.0-next.18 From a10f6db6e540ef786959be5a6ff4d1b35b916186 Mon Sep 17 00:00:00 2001 From: Tom French Date: Fri, 24 Nov 2023 12:55:57 +0000 Subject: [PATCH 2/4] chore: update workflow --- .github/workflows/docs-pr.yml | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/.github/workflows/docs-pr.yml b/.github/workflows/docs-pr.yml index 02044c82224..144923c14e3 100644 --- a/.github/workflows/docs-pr.yml +++ b/.github/workflows/docs-pr.yml @@ -55,7 +55,7 @@ jobs: if: needs.add_label.outputs.has_label == 'true' steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup Node.js uses: actions/setup-node@v2 @@ -71,20 +71,8 @@ jobs: run: | npm i wasm-opt -g - - name: Install dependencies - run: yarn - - - name: Build acvm_js - run: yarn workspace @noir-lang/acvm_js build - - - name: Build noirc_abi - run: yarn workspace @noir-lang/noirc_abi build - - - name: Build noir_js_types - run: yarn workspace @noir-lang/types build - - - name: Build barretenberg wrapper - run: yarn workspace @noir-lang/backend_barretenberg build + - name: Install Yarn dependencies + uses: ./.github/actions/setup - name: Run noir_js run: | @@ -97,8 +85,9 @@ jobs: run: yarn setStable - name: Build docs + working-directory: docs run: - yarn workspace docs build + yarn workspaces foreach -Rt run build - name: Deploy to Netlify uses: nwtgck/actions-netlify@v2.1 From 4069525174027f487e149a60873e5d4661f2b19a Mon Sep 17 00:00:00 2001 From: Tom French Date: Fri, 24 Nov 2023 14:20:13 +0000 Subject: [PATCH 3/4] chore: add clean script for noir types package --- tooling/noir_js_types/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tooling/noir_js_types/package.json b/tooling/noir_js_types/package.json index 57bb2f050b7..4232358ddff 100644 --- a/tooling/noir_js_types/package.json +++ b/tooling/noir_js_types/package.json @@ -19,7 +19,8 @@ "build": "yarn run build:cjs && yarn run build:esm", "nightly:version": "jq --arg new_version \"-$(git rev-parse --short HEAD)$1\" '.version = .version + $new_version' package.json > package-tmp.json && mv package-tmp.json package.json", "publish": "echo 📡 publishing `$npm_package_name` && yarn npm publish", - "lint": "NODE_NO_WARNINGS=1 eslint . --ext .ts --ignore-path ./.eslintignore --max-warnings 0" + "lint": "NODE_NO_WARNINGS=1 eslint . --ext .ts --ignore-path ./.eslintignore --max-warnings 0", + "clean": "rm -rf ./lib" }, "exports": { ".": { From beb0695ea4028c5142356abd556a1e7fe10b28d2 Mon Sep 17 00:00:00 2001 From: Tom French Date: Fri, 24 Nov 2023 14:25:10 +0000 Subject: [PATCH 4/4] chore: remove leftover step from workflow --- .github/workflows/docs-pr.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/docs-pr.yml b/.github/workflows/docs-pr.yml index 144923c14e3..2b304b72b6f 100644 --- a/.github/workflows/docs-pr.yml +++ b/.github/workflows/docs-pr.yml @@ -74,10 +74,6 @@ jobs: - name: Install Yarn dependencies uses: ./.github/actions/setup - - name: Run noir_js - run: | - yarn workspace @noir-lang/noir_js build - - name: Remove pre-releases working-directory: docs env: