From 4c04d21f7e7b01df8898a86455422d177f31de73 Mon Sep 17 00:00:00 2001 From: Tom French Date: Thu, 14 Sep 2023 14:57:01 +0100 Subject: [PATCH 01/30] chore: remove unnecessary gitignores --- compiler/wasm/.gitignore | 8 -------- tooling/noirc_abi_wasm/.gitignore | 8 -------- 2 files changed, 16 deletions(-) delete mode 100644 compiler/wasm/.gitignore delete mode 100644 tooling/noirc_abi_wasm/.gitignore diff --git a/compiler/wasm/.gitignore b/compiler/wasm/.gitignore deleted file mode 100644 index 37b89b7a2ab..00000000000 --- a/compiler/wasm/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Yarn -.pnp.* -.yarn/* -!.yarn/patches -!.yarn/plugins -!.yarn/releases -!.yarn/sdks -!.yarn/versions diff --git a/tooling/noirc_abi_wasm/.gitignore b/tooling/noirc_abi_wasm/.gitignore deleted file mode 100644 index 07c883e0b8a..00000000000 --- a/tooling/noirc_abi_wasm/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Yarn -.pnp.* -.yarn/* -!.yarn/patches -!.yarn/plugins -!.yarn/releases -!.yarn/sdks -!.yarn/versions \ No newline at end of file From 6d89ee6ba5b6a8b70490862e6c6e655c216425a4 Mon Sep 17 00:00:00 2001 From: Tom French Date: Thu, 14 Sep 2023 15:23:43 +0100 Subject: [PATCH 02/30] chore(ci): cache yarn dependencies --- .github/actions/setup/action.yml | 9 +-------- .github/workflows/abi_wasm.yml | 5 ++--- .github/workflows/publish.yml | 11 ++++++++--- .github/workflows/test-integration.yml | 7 ++++--- .github/workflows/test-source-resolver.yml | 4 ++-- .github/workflows/wasm.yml | 4 +++- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 36c8f1bccb2..6874108952d 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -1,10 +1,5 @@ name: Setup -inputs: - working-directory: - default: ./ - required: false - runs: using: composite steps: @@ -19,8 +14,6 @@ runs: path: "**/node_modules" key: yarn-v1-${{ hashFiles('**/yarn.lock') }} - name: Install - run: | - cd ${{ inputs.working-directory }} - yarn --immutable + run: yarn --immutable shell: bash if: steps.cache.outputs.cache-hit != 'true' diff --git a/.github/workflows/abi_wasm.yml b/.github/workflows/abi_wasm.yml index c957a59941f..4e5ab9e3925 100644 --- a/.github/workflows/abi_wasm.yml +++ b/.github/workflows/abi_wasm.yml @@ -72,9 +72,8 @@ jobs: path: ${{ env.UPLOAD_PATH }} retention-days: 10 - - name: Install workspace dependencies - run: | - yarn install --immutable + - name: Install Yarn dependencies + uses: ./.github/actions/setup - name: Run node tests run: | diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 7c3b23941ed..18d0fa60e35 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -74,11 +74,13 @@ jobs: path: ./dist/* retention-days: 3 - - name: Test built artifact + - name: Install Yarn dependencies if: matrix.target == 'x86_64-apple-darwin' + uses: ./.github/actions/setup + + - name: Test built artifact run: | cp ./target/${{ matrix.target }}/release/nargo ~/.cargo/bin/ - yarn install --immutable yarn workspace release-tests test - name: Upload binaries to release tag @@ -139,11 +141,14 @@ jobs: path: ./dist/* retention-days: 3 + - name: Install Yarn dependencies + if: startsWith(matrix.target, 'x86_64-unknown-linux') + uses: ./.github/actions/setup + - name: Test built artifact if: startsWith(matrix.target, 'x86_64-unknown-linux') run: | cp ./target/${{ matrix.target }}/release/nargo ~/.cargo/bin/ - yarn install --immutable yarn workspace release-tests test - name: Upload binaries to release tag diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml index 4a941a89105..45b5752cc40 100644 --- a/.github/workflows/test-integration.yml +++ b/.github/workflows/test-integration.yml @@ -77,10 +77,11 @@ jobs: path: ${{ env.UPLOAD_PATH }} retention-days: 3 + - name: Install Yarn dependencies + uses: ./.github/actions/setup + - name: Run `integration-tests` - run: | - yarn install --immutable - yarn test:integration + run: yarn test:integration - name: Alert on nightly test failure uses: JasonEtco/create-an-issue@v2 diff --git a/.github/workflows/test-source-resolver.yml b/.github/workflows/test-source-resolver.yml index 87ffc96e866..3f39b68061b 100644 --- a/.github/workflows/test-source-resolver.yml +++ b/.github/workflows/test-source-resolver.yml @@ -16,8 +16,8 @@ jobs: - name: Checkout uses: actions/checkout@v3 - - name: Install dependencies - run: yarn install --immutable + - name: Install Yarn dependencies + uses: ./.github/actions/setup - name: Build noir-source-resolver run: yarn workspace @noir-lang/noir-source-resolver build diff --git a/.github/workflows/wasm.yml b/.github/workflows/wasm.yml index 89d790cb00e..0931a6e907c 100644 --- a/.github/workflows/wasm.yml +++ b/.github/workflows/wasm.yml @@ -132,13 +132,15 @@ jobs: chmod +x $nargo_binary $nargo_binary compile + - name: Install Yarn dependencies + uses: ./.github/actions/setup + - name: Install dependencies run: | npx playwright install npx playwright install-deps cp -r ./compiler/wasm/downloaded/nodejs ./compiler/wasm cp -r ./compiler/wasm/downloaded/web ./compiler/wasm - yarn install --immutable yarn workspace @noir-lang/noir-source-resolver build - name: Run tests From d428d33a95d09b2dcf954eb65fc1145d74430a1d Mon Sep 17 00:00:00 2001 From: Tom French Date: Thu, 14 Sep 2023 15:28:22 +0100 Subject: [PATCH 03/30] chore(ci): cache playwright --- .github/actions/install-playwright/action.yml | 25 +++++++++++++++++++ .github/actions/setup/action.yml | 2 +- .github/workflows/abi_wasm.yml | 20 ++------------- .github/workflows/wasm.yml | 5 ++-- 4 files changed, 31 insertions(+), 21 deletions(-) create mode 100644 .github/actions/install-playwright/action.yml diff --git a/.github/actions/install-playwright/action.yml b/.github/actions/install-playwright/action.yml new file mode 100644 index 00000000000..9860dd62864 --- /dev/null +++ b/.github/actions/install-playwright/action.yml @@ -0,0 +1,25 @@ +name: Install Playwright + +runs: + using: composite + steps: + - name: Query playwright version + shell: bash + working-directory: ./tooling/noirc_abi_wasm + run: echo "PLAYWRIGHT_VERSION=$(yarn info @web/test-runner-playwright --json | jq .children.Version)" >> $GITHUB_ENV + + - name: Cache playwright binaries + uses: actions/cache@v3 + id: playwright-cache + with: + path: | + ~/.cache/ms-playwright + key: ${{ runner.os }}-playwright-${{ env.PLAYWRIGHT_VERSION }} + + - name: Install playwright deps + shell: bash + if: steps.playwright-cache.outputs.cache-hit != 'true' + working-directory: ./tooling/noirc_abi_wasm + run: | + npx playwright install + npx playwright install-deps diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 6874108952d..2b75f9ab922 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -1,4 +1,4 @@ -name: Setup +name: Install Yarn dependencies runs: using: composite diff --git a/.github/workflows/abi_wasm.yml b/.github/workflows/abi_wasm.yml index 4e5ab9e3925..c86a65c998e 100644 --- a/.github/workflows/abi_wasm.yml +++ b/.github/workflows/abi_wasm.yml @@ -79,24 +79,8 @@ jobs: run: | yarn workspace @noir-lang/noirc_abi test - - name: Cache playwright binaries - uses: actions/cache@v3 - id: playwright-cache - with: - path: | - ~/.cache/ms-playwright - key: ${{ runner.os }}-playwright-${{ env.PLAYWRIGHT_VERSION }} - - - name: Query playwright version - working-directory: ./tooling/noirc_abi_wasm - run: echo "PLAYWRIGHT_VERSION=$(yarn info @web/test-runner-playwright --json | jq .children.Version)" >> $GITHUB_ENV - - - name: Install playwright deps - if: steps.playwright-cache.outputs.cache-hit != 'true' - working-directory: ./tooling/noirc_abi_wasm - run: | - npx playwright install - npx playwright install-deps + - name: Install Playwright + uses: ./.github/actions/install-playwright - name: Run browser tests working-directory: ./tooling/noirc_abi_wasm diff --git a/.github/workflows/wasm.yml b/.github/workflows/wasm.yml index 0931a6e907c..65517c7ee3d 100644 --- a/.github/workflows/wasm.yml +++ b/.github/workflows/wasm.yml @@ -135,10 +135,11 @@ jobs: - name: Install Yarn dependencies uses: ./.github/actions/setup + - name: Install Playwright + uses: ./.github/actions/install-playwright + - name: Install dependencies run: | - npx playwright install - npx playwright install-deps cp -r ./compiler/wasm/downloaded/nodejs ./compiler/wasm cp -r ./compiler/wasm/downloaded/web ./compiler/wasm yarn workspace @noir-lang/noir-source-resolver build From 0919c639920bc25aeaae00e077643b599b2bfeea Mon Sep 17 00:00:00 2001 From: Tom French Date: Thu, 14 Sep 2023 15:59:23 +0100 Subject: [PATCH 04/30] chore: fix tests on mac publishing --- .github/workflows/publish.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 18d0fa60e35..f39f35775f7 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -79,6 +79,7 @@ jobs: uses: ./.github/actions/setup - name: Test built artifact + if: matrix.target == 'x86_64-apple-darwin' run: | cp ./target/${{ matrix.target }}/release/nargo ~/.cargo/bin/ yarn workspace release-tests test From a2c153bdfc30f24dcbffb769c731bb18310477d5 Mon Sep 17 00:00:00 2001 From: Tom French Date: Thu, 14 Sep 2023 16:38:32 +0100 Subject: [PATCH 05/30] chore: add `noir_wasm_testing.json` to gitignore --- compiler/wasm/.gitignore | 1 + compiler/wasm/noir-script/target/noir_wasm_testing.json | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 compiler/wasm/.gitignore delete mode 100644 compiler/wasm/noir-script/target/noir_wasm_testing.json diff --git a/compiler/wasm/.gitignore b/compiler/wasm/.gitignore new file mode 100644 index 00000000000..f968dafbcc3 --- /dev/null +++ b/compiler/wasm/.gitignore @@ -0,0 +1 @@ +noir-script/target diff --git a/compiler/wasm/noir-script/target/noir_wasm_testing.json b/compiler/wasm/noir-script/target/noir_wasm_testing.json deleted file mode 100644 index fdf25a4743d..00000000000 --- a/compiler/wasm/noir-script/target/noir_wasm_testing.json +++ /dev/null @@ -1 +0,0 @@ -{"backend":"acvm-backend-barretenberg","abi":{"parameters":[{"name":"x","type":{"kind":"integer","sign":"unsigned","width":64},"visibility":"private"},{"name":"y","type":{"kind":"integer","sign":"unsigned","width":64},"visibility":"public"}],"param_witnesses":{"x":[1],"y":[2]},"return_type":null,"return_witnesses":[]},"bytecode":"H4sIAAAAAAAA/81WXW7DIAw20BJl0noWE6CBt6k3WbT0/kfYooJm0bQPxZZqKXKw4PPPB5Y/AOATbqL+Pl30F1nrsqaiiq52j+cQ1nlanXffOOUlRQxxOSeXXEzxZ0rerymkOS95xuyCX901Zn/Fm5jXsbDBcobE9yxm7BNn+LCQxnvY+dfEZoq2AjlB46et42nHxupcgqSDAO4R+C6/VN5Hfo6QQIrWFDvFwP9DoaKZY1aM90C/HpdrDTupvyP2nS/a6GzRA7GNhEfd7Nu4qJxvb/5CzimiFcG4kDN7e9QDnJHY6vkTiQX4aoICjR5FG3mdHCwp5rYe4H6SMAK+Kxbng+zFGkGmCbf1652eLGPOAyOvHfV72sC4J1nLyPOjptXKL8ADXjPGCwAA"} \ No newline at end of file From 10b147d73fde2857f0018f227c2f1e5b3a5c6b48 Mon Sep 17 00:00:00 2001 From: Tom French Date: Thu, 14 Sep 2023 16:42:44 +0100 Subject: [PATCH 06/30] chore: separate building from testing `noirc_abi_wasm` --- .github/workflows/abi_wasm.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/abi_wasm.yml b/.github/workflows/abi_wasm.yml index c86a65c998e..429dbc952de 100644 --- a/.github/workflows/abi_wasm.yml +++ b/.github/workflows/abi_wasm.yml @@ -72,6 +72,20 @@ jobs: path: ${{ env.UPLOAD_PATH }} retention-days: 10 + noirc-abi-wasm-test: + needs: [noirc-abi-wasm-build] + runs-on: ubuntu-latest + + steps: + - name: Checkout sources + uses: actions/checkout@v3 + + - name: Download noirc_abi_wasm package artifact + uses: actions/download-artifact@v3 + with: + name: noirc_abi_wasm + path: ./tooling/noirc_abi_wasm + - name: Install Yarn dependencies uses: ./.github/actions/setup From aa4f1c9ec79d69378f981e9dfaf8b49efda6321b Mon Sep 17 00:00:00 2001 From: Tom French Date: Thu, 14 Sep 2023 16:53:07 +0100 Subject: [PATCH 07/30] chore: remove unnecessary `working-directory` --- .github/workflows/abi_wasm.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/abi_wasm.yml b/.github/workflows/abi_wasm.yml index 429dbc952de..38baddd5b87 100644 --- a/.github/workflows/abi_wasm.yml +++ b/.github/workflows/abi_wasm.yml @@ -90,14 +90,11 @@ jobs: uses: ./.github/actions/setup - name: Run node tests - run: | - yarn workspace @noir-lang/noirc_abi test + run: yarn workspace @noir-lang/noirc_abi test - name: Install Playwright uses: ./.github/actions/install-playwright - name: Run browser tests - working-directory: ./tooling/noirc_abi_wasm - run: | - yarn workspace @noir-lang/noirc_abi test:browser + run: yarn workspace @noir-lang/noirc_abi test:browser From 4e3740771e6f4ac25d08c52ff3a69d67dac75881 Mon Sep 17 00:00:00 2001 From: Tom French Date: Thu, 14 Sep 2023 16:56:27 +0100 Subject: [PATCH 08/30] chore: remove unwanted `working-directory`s --- .github/actions/install-playwright/action.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/actions/install-playwright/action.yml b/.github/actions/install-playwright/action.yml index 9860dd62864..6d424d84442 100644 --- a/.github/actions/install-playwright/action.yml +++ b/.github/actions/install-playwright/action.yml @@ -5,7 +5,6 @@ runs: steps: - name: Query playwright version shell: bash - working-directory: ./tooling/noirc_abi_wasm run: echo "PLAYWRIGHT_VERSION=$(yarn info @web/test-runner-playwright --json | jq .children.Version)" >> $GITHUB_ENV - name: Cache playwright binaries @@ -19,7 +18,6 @@ runs: - name: Install playwright deps shell: bash if: steps.playwright-cache.outputs.cache-hit != 'true' - working-directory: ./tooling/noirc_abi_wasm run: | npx playwright install npx playwright install-deps From e8418afd97a52adef525f1777cb74803129723da Mon Sep 17 00:00:00 2001 From: Tom French Date: Thu, 14 Sep 2023 17:03:08 +0100 Subject: [PATCH 09/30] chore: add descriptions to github actions --- .github/actions/install-playwright/action.yml | 1 + .github/actions/setup/action.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/actions/install-playwright/action.yml b/.github/actions/install-playwright/action.yml index 6d424d84442..5c9d560e5ff 100644 --- a/.github/actions/install-playwright/action.yml +++ b/.github/actions/install-playwright/action.yml @@ -1,4 +1,5 @@ name: Install Playwright +description: Installs Playwright and its dependencies and caches them. runs: using: composite diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 2b75f9ab922..8c9343c20ea 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -1,4 +1,5 @@ name: Install Yarn dependencies +description: Installs the workspace's yarn dependencies and caches them runs: using: composite From 06d052ae9a747b0fcab71977a598ae2b8bd6317d Mon Sep 17 00:00:00 2001 From: Tom French Date: Thu, 14 Sep 2023 17:16:44 +0100 Subject: [PATCH 10/30] chore: add step to poke yarn --- .github/workflows/abi_wasm.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/abi_wasm.yml b/.github/workflows/abi_wasm.yml index 38baddd5b87..7661302baa1 100644 --- a/.github/workflows/abi_wasm.yml +++ b/.github/workflows/abi_wasm.yml @@ -89,6 +89,9 @@ jobs: - name: Install Yarn dependencies uses: ./.github/actions/setup + - name: poke Yarn + run: yarn install --immutable + - name: Run node tests run: yarn workspace @noir-lang/noirc_abi test From 8c7c51c57965422fe829feb138d095f2f513cb3a Mon Sep 17 00:00:00 2001 From: Tom French Date: Thu, 14 Sep 2023 17:43:06 +0100 Subject: [PATCH 11/30] chore: run node and browser tests separately --- .github/workflows/wasm.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/wasm.yml b/.github/workflows/wasm.yml index 65517c7ee3d..344680517aa 100644 --- a/.github/workflows/wasm.yml +++ b/.github/workflows/wasm.yml @@ -144,7 +144,8 @@ jobs: cp -r ./compiler/wasm/downloaded/web ./compiler/wasm yarn workspace @noir-lang/noir-source-resolver build - - name: Run tests - run: | - yarn workspace @noir-lang/noir_wasm test:browser - yarn workspace @noir-lang/noir_wasm test:node + - name: Run node tests + run: yarn workspace @noir-lang/noir_wasm test:node + + - name: Run browser tests + run: yarn workspace @noir-lang/noir_wasm test:browser From f9c1da11f014ca3a0c5c0b57224b942a75ea3e26 Mon Sep 17 00:00:00 2001 From: Tom French Date: Thu, 14 Sep 2023 18:01:46 +0100 Subject: [PATCH 12/30] chore: use consistent set of browsers across tests --- compiler/wasm/web-test-runner.config.mjs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/wasm/web-test-runner.config.mjs b/compiler/wasm/web-test-runner.config.mjs index 111c1ca627d..3fd65d56618 100644 --- a/compiler/wasm/web-test-runner.config.mjs +++ b/compiler/wasm/web-test-runner.config.mjs @@ -9,8 +9,8 @@ const reporter = process.env.CI ? summaryReporter() : defaultReporter(); export default { browsers: [ playwrightLauncher({ product: "chromium" }), - playwrightLauncher({ product: "webkit" }), - playwrightLauncher({ product: "firefox" }), + // playwrightLauncher({ product: "webkit" }), + // playwrightLauncher({ product: "firefox" }), ], plugins: [ esbuildPlugin({ From f73ae2f7f7a0149a672ec129f4c934a99de16252 Mon Sep 17 00:00:00 2001 From: Tom French Date: Thu, 14 Sep 2023 18:18:02 +0100 Subject: [PATCH 13/30] chore: remove explicit node from setup action --- .github/actions/setup/action.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 8c9343c20ea..5efe115ddcf 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -4,10 +4,6 @@ description: Installs the workspace's yarn dependencies and caches them runs: using: composite steps: - - name: Install node - uses: actions/setup-node@v3 - with: - node-version: 18.17.1 - name: Cache uses: actions/cache@v3 id: cache From e8ed74425b55e8948b59594b9960252a0ea3b18b Mon Sep 17 00:00:00 2001 From: Tom French Date: Thu, 14 Sep 2023 18:40:52 +0100 Subject: [PATCH 14/30] chore: update dependencies --- compiler/integration-tests/package.json | 4 +++- compiler/wasm/package.json | 1 + package.json | 3 --- tooling/noirc_abi_wasm/package.json | 1 + yarn.lock | 7 ++++--- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/compiler/integration-tests/package.json b/compiler/integration-tests/package.json index beb392a591d..e6e3bfee772 100644 --- a/compiler/integration-tests/package.json +++ b/compiler/integration-tests/package.json @@ -19,6 +19,8 @@ "@web/dev-server-esbuild": "^0.3.6", "@web/test-runner": "^0.15.3", "@web/test-runner-playwright": "^0.10.0", - "@web/test-runner-webdriver": "^0.7.0" + "@web/test-runner-webdriver": "^0.7.0", + "fflate": "^0.8.0", + "smol-toml": "^1.1.2" } } diff --git a/compiler/wasm/package.json b/compiler/wasm/package.json index 2c3463134e0..00d494f24d4 100644 --- a/compiler/wasm/package.json +++ b/compiler/wasm/package.json @@ -29,6 +29,7 @@ "@noir-lang/noir-source-resolver": "^1.1.3" }, "devDependencies": { + "@esm-bundle/chai": "^4.3.4-fix.0", "@web/dev-server-esbuild": "^0.3.6", "@web/test-runner": "^0.15.3", "@web/test-runner-playwright": "^0.10.0", diff --git a/package.json b/package.json index 43833c7d17e..f7c4e944347 100644 --- a/package.json +++ b/package.json @@ -15,16 +15,13 @@ "test:integration": "yarn workspace integration-tests test" }, "devDependencies": { - "@esm-bundle/chai": "^4.3.4-fix.0", "@typescript-eslint/eslint-plugin": "^5.59.5", "@typescript-eslint/parser": "^5.59.5", "chai": "^4.3.7", "eslint": "^8.40.0", "eslint-plugin-prettier": "^4.2.1", - "fflate": "^0.8.0", "mocha": "^10.2.0", "prettier": "^2.8.8", - "smol-toml": "^1.1.2", "ts-node": "^10.9.1", "typescript": "^5.0.4" }, diff --git a/tooling/noirc_abi_wasm/package.json b/tooling/noirc_abi_wasm/package.json index fb5db6a97dc..c54a51b6743 100644 --- a/tooling/noirc_abi_wasm/package.json +++ b/tooling/noirc_abi_wasm/package.json @@ -29,6 +29,7 @@ "lint": "NODE_NO_WARNINGS=1 eslint . --ext .ts --ignore-path ./.eslintignore --max-warnings 0" }, "devDependencies": { + "@esm-bundle/chai": "^4.3.4-fix.0", "@web/dev-server-esbuild": "^0.3.6", "@web/test-runner": "^0.15.3", "@web/test-runner-playwright": "^0.10.0", diff --git a/yarn.lock b/yarn.lock index 14252256e89..096891da27f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -406,6 +406,7 @@ __metadata: version: 0.0.0-use.local resolution: "@noir-lang/noir_wasm@workspace:compiler/wasm" dependencies: + "@esm-bundle/chai": ^4.3.4-fix.0 "@web/dev-server-esbuild": ^0.3.6 "@web/test-runner": ^0.15.3 "@web/test-runner-playwright": ^0.10.0 @@ -420,6 +421,7 @@ __metadata: version: 0.0.0-use.local resolution: "@noir-lang/noirc_abi@workspace:tooling/noirc_abi_wasm" dependencies: + "@esm-bundle/chai": ^4.3.4-fix.0 "@web/dev-server-esbuild": ^0.3.6 "@web/test-runner": ^0.15.3 "@web/test-runner-playwright": ^0.10.0 @@ -433,16 +435,13 @@ __metadata: version: 0.0.0-use.local resolution: "@noir-lang/root@workspace:." dependencies: - "@esm-bundle/chai": ^4.3.4-fix.0 "@typescript-eslint/eslint-plugin": ^5.59.5 "@typescript-eslint/parser": ^5.59.5 chai: ^4.3.7 eslint: ^8.40.0 eslint-plugin-prettier: ^4.2.1 - fflate: ^0.8.0 mocha: ^10.2.0 prettier: ^2.8.8 - smol-toml: ^1.1.2 ts-node: ^10.9.1 typescript: ^5.0.4 languageName: unknown @@ -4262,6 +4261,8 @@ __metadata: "@web/test-runner": ^0.15.3 "@web/test-runner-playwright": ^0.10.0 "@web/test-runner-webdriver": ^0.7.0 + fflate: ^0.8.0 + smol-toml: ^1.1.2 languageName: unknown linkType: soft From 9d9c9476c92742667227b07b1a44de7f15da0c74 Mon Sep 17 00:00:00 2001 From: Tom French Date: Fri, 15 Sep 2023 11:31:29 +0100 Subject: [PATCH 15/30] chore: split build and tests jobs in `abi_wasm.yml` --- .github/workflows/abi_wasm.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/.github/workflows/abi_wasm.yml b/.github/workflows/abi_wasm.yml index c957a59941f..c7a5e261890 100644 --- a/.github/workflows/abi_wasm.yml +++ b/.github/workflows/abi_wasm.yml @@ -13,7 +13,7 @@ concurrency: cancel-in-progress: true jobs: - noirc-abi-wasm-build: + build: runs-on: ubuntu-latest env: CACHED_PATH: /tmp/nix-cache @@ -72,6 +72,20 @@ jobs: path: ${{ env.UPLOAD_PATH }} retention-days: 10 + test: + runs-on: ubuntu-latest + needs: [build] + + steps: + - name: Checkout sources + uses: actions/checkout@v3 + + - name: Download wasm package artifact + uses: actions/download-artifact@v3 + with: + name: noir_wasm + path: ./tooling/noirc_abi_wasm + - name: Install workspace dependencies run: | yarn install --immutable From a416626d5e9afab6e776803355ae6d44dea5c8c9 Mon Sep 17 00:00:00 2001 From: kevaundray Date: Fri, 15 Sep 2023 11:53:45 +0100 Subject: [PATCH 16/30] Update .github/workflows/abi_wasm.yml --- .github/workflows/abi_wasm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/abi_wasm.yml b/.github/workflows/abi_wasm.yml index c7a5e261890..c60618168df 100644 --- a/.github/workflows/abi_wasm.yml +++ b/.github/workflows/abi_wasm.yml @@ -83,7 +83,7 @@ jobs: - name: Download wasm package artifact uses: actions/download-artifact@v3 with: - name: noir_wasm + name: noirc_abi_wasm path: ./tooling/noirc_abi_wasm - name: Install workspace dependencies From f7a86eea30cfed4174af2b1dceb3651b073a1c0f Mon Sep 17 00:00:00 2001 From: Tom French Date: Fri, 15 Sep 2023 12:22:14 +0100 Subject: [PATCH 17/30] chore: refresh lockfile --- yarn.lock | 204 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 118 insertions(+), 86 deletions(-) diff --git a/yarn.lock b/yarn.lock index 29a07f2d1e5..4f75c7e1345 100644 --- a/yarn.lock +++ b/yarn.lock @@ -47,9 +47,9 @@ __metadata: linkType: hard "@babel/helper-validator-identifier@npm:^7.22.5": - version: 7.22.15 - resolution: "@babel/helper-validator-identifier@npm:7.22.15" - checksum: eb0bee4bda664c0959924bc1ad5611eacfce806f46612202dd164fef1df8fef1a11682a1e7615288987100e9fb304982b6e2a4ff07ffe842ab8765b95ed1118c + version: 7.22.19 + resolution: "@babel/helper-validator-identifier@npm:7.22.19" + checksum: cf1f94d35cdb2d0f519b31954d1c54929fb31cf8af70fed12b3a1e777c296fabe747e56d9ae3d181c1c96f33ac66aff9501189542554b6fe0508748a38c1c17f languageName: node linkType: hard @@ -270,11 +270,11 @@ __metadata: linkType: hard "@esm-bundle/chai@npm:^4.3.4-fix.0": - version: 4.3.4-fix.0 - resolution: "@esm-bundle/chai@npm:4.3.4-fix.0" + version: 4.3.4 + resolution: "@esm-bundle/chai@npm:4.3.4" dependencies: "@types/chai": ^4.2.12 - checksum: 565b0a92775bb277726fbd687826157596325f7a38fc51baa695e9adc13f629be3b76a2a38830781b238acce469e49f729ff7b4dc886e9a2dc6ecbdb82227693 + checksum: 6d1237e9b8309b31ca55d12abe03642ab58550fdac24d0acbfeae6ab14182f72cedf646c6e858fd7ef592b4034ddd23ce5882ff22b8ab9b7952327e9f3f8c3f5 languageName: node linkType: hard @@ -385,20 +385,13 @@ __metadata: languageName: node linkType: hard -"@noir-lang/acvm_js@npm:0.26.1": +"@noir-lang/acvm_js@npm:0.26.1, @noir-lang/acvm_js@npm:^0.26.0": version: 0.26.1 resolution: "@noir-lang/acvm_js@npm:0.26.1" checksum: ae8cb6e31610cd8aa392855342d0c953a1bc4cd9e07236340341afa5815696a69a6635c38241f1d6a5dd30c5a8ae49234f2ba8b71d46c5d1a46756ff6f4dde3a languageName: node linkType: hard -"@noir-lang/acvm_js@npm:^0.26.0": - version: 0.26.0 - resolution: "@noir-lang/acvm_js@npm:0.26.0" - checksum: 3325b611fec4531363cb67682d50ea40cbeaf8da7672c8373cb11bc7786308a14c61804950b4805e071edc9298005039847621a8d79fae185eda2cf981c64b39 - languageName: node - linkType: hard - "@noir-lang/noir-source-resolver@workspace:*, @noir-lang/noir-source-resolver@workspace:compiler/source-resolver": version: 0.0.0-use.local resolution: "@noir-lang/noir-source-resolver@workspace:compiler/source-resolver" @@ -527,19 +520,19 @@ __metadata: linkType: hard "@puppeteer/browsers@npm:^1.6.0": - version: 1.7.0 - resolution: "@puppeteer/browsers@npm:1.7.0" + version: 1.7.1 + resolution: "@puppeteer/browsers@npm:1.7.1" dependencies: debug: 4.3.4 extract-zip: 2.0.1 progress: 2.0.3 - proxy-agent: 6.3.0 + proxy-agent: 6.3.1 tar-fs: 3.0.4 unbzip2-stream: 1.4.3 yargs: 17.7.1 bin: browsers: lib/cjs/main-cli.js - checksum: 0a2aecc72fb94a8d94246188f94cfaad730d1d372b34df94ca51ff8a94596bf475a0fee162c317a768fa4b2a707bfa8afd582d594958f49e1019effadfe744b6 + checksum: fb7cf7773a1aed4e34ce0952dbf9609a164e624d4f8e1f342b816fe3e983888d7a7b2fbafc963559e96cb5bca0d75fb9c81f2097f9b1f5478a0f1cc7cbc12dff languageName: node linkType: hard @@ -816,24 +809,24 @@ __metadata: linkType: hard "@types/keygrip@npm:*": - version: 1.0.2 - resolution: "@types/keygrip@npm:1.0.2" - checksum: 60bc2738a4f107070ee3d96f44709cb38f3a96c7ccabab09f56c1b2b4d85f869fd8fb9f1f2937e863d0e9e781f005c2223b823bf32b859185b4f52370c352669 + version: 1.0.3 + resolution: "@types/keygrip@npm:1.0.3" + checksum: adee9a3efda3db9c64466af1c7c91a6d049420ee50589500cfd36e3e38d6abefdd858da88e6da63ed186e588127af3e862c1dc64fb0ad45c91870e6c35fe3be0 languageName: node linkType: hard "@types/koa-compose@npm:*": - version: 3.2.5 - resolution: "@types/koa-compose@npm:3.2.5" + version: 3.2.6 + resolution: "@types/koa-compose@npm:3.2.6" dependencies: "@types/koa": "*" - checksum: 5d1147c4b057eb158195f442f0384f06503f3e69dba99fb517b30a05261a9f92928945c12bb1cfc17a5b7d60db003f38b455a3a9b125f12e4fc81fffa396b3cf + checksum: 1204c5bfa4c69448b692aba29c566ef6bedbdbe5842fa180450267a23d3606faa13ef209876fd0c989edb5bc381812a66610fcfeac196ce4e76364354756ba1f languageName: node linkType: hard "@types/koa@npm:*, @types/koa@npm:^2.11.6": - version: 2.13.8 - resolution: "@types/koa@npm:2.13.8" + version: 2.13.9 + resolution: "@types/koa@npm:2.13.9" dependencies: "@types/accepts": "*" "@types/content-disposition": "*" @@ -843,7 +836,7 @@ __metadata: "@types/keygrip": "*" "@types/koa-compose": "*" "@types/node": "*" - checksum: 76a2a6d219c65f242a43efca42970d864701c58319c346a91dd8c3b4df2021786fd0d600a88dfb098358c9085f9f4a2dfe62563641441cf21e11e2bfe04f4fdf + checksum: af9cd599c8e17e2ae0f4168a61d964e343f713d002b65fd995658d7addc6551ccadecfd32b3405cf44e4d360178ee4f972d6881533548261ae1f636a655d24b1 languageName: node linkType: hard @@ -876,16 +869,16 @@ __metadata: linkType: hard "@types/node@npm:*, @types/node@npm:^20.1.0, @types/node@npm:^20.5.7": - version: 20.6.0 - resolution: "@types/node@npm:20.6.0" - checksum: 52611801af5cf151c6fac1963aa4a8a8ca2e388a9e9ed82b01b70bca762088ded5b32cc789c5564220d5d7dccba2b8dd34446a3d4fc74736805e1f2cf262e29d + version: 20.6.1 + resolution: "@types/node@npm:20.6.1" + checksum: f9848617221b513d558071c804b006750d1ee1734c5ffea3ada9a0edd1642334ad0812222d6b99b7b8c0e1a5f1e557946ae99444c2705e9afc125abdf9fa36c2 languageName: node linkType: hard "@types/node@npm:^18.7.20": - version: 18.17.15 - resolution: "@types/node@npm:18.17.15" - checksum: eed11d4398ccdb999a4c65658ee75de621a4ad57aece48ed2fb8803b1e2711fadf58d8aefbdb0a447d69cf3cba602ca32fe0fc92077575950a796e1dc13baa0f + version: 18.17.16 + resolution: "@types/node@npm:18.17.16" + checksum: 8f9dbaf4a67a14110e2a0d805f9b57f3a5cda774dbcb7b1e7973efe31d5eeea358482dbe36a5bfadb0dde99f065f1ae0531f25a032f015871aa0b2896eb3c4ae languageName: node linkType: hard @@ -934,9 +927,9 @@ __metadata: linkType: hard "@types/semver@npm:^7.3.12": - version: 7.5.1 - resolution: "@types/semver@npm:7.5.1" - checksum: 2fffe938c7ac168711f245a16e1856a3578d77161ca17e29a05c3e02c7be3e9c5beefa29a3350f6c1bd982fb70aa28cc52e4845eb7d36246bcdc0377170d584d + version: 7.5.2 + resolution: "@types/semver@npm:7.5.2" + checksum: 743aa8a2b58e20b329c19bd2459152cb049d12fafab7279b90ac11e0f268c97efbcb606ea0c681cca03f79015381b40d9b1244349b354270bec3f939ed49f6e9 languageName: node linkType: hard @@ -1116,19 +1109,19 @@ __metadata: languageName: node linkType: hard -"@wdio/config@npm:8.16.3": - version: 8.16.3 - resolution: "@wdio/config@npm:8.16.3" +"@wdio/config@npm:8.16.7": + version: 8.16.7 + resolution: "@wdio/config@npm:8.16.7" dependencies: "@wdio/logger": 8.11.0 - "@wdio/types": 8.16.3 - "@wdio/utils": 8.16.3 + "@wdio/types": 8.16.7 + "@wdio/utils": 8.16.7 decamelize: ^6.0.0 deepmerge-ts: ^5.0.0 glob: ^10.2.2 import-meta-resolve: ^3.0.0 read-pkg-up: ^10.0.0 - checksum: 8a9eb4a6472432ac6c3e1716b0aad38d88490e93f01fd0b3acc9087af65491f5bfb180fe21629bea27e1158487ec327d9fe85878fda58db1bafa95ab88b35f6f + checksum: 3eeaccfb8876c54101ad6d3c122e07d4e60dd3c69a9596b3b24333804835af60103bfa660c0d784dd1444263771a003879787eba3030f1179433b5330697a0a3 languageName: node linkType: hard @@ -1160,22 +1153,22 @@ __metadata: languageName: node linkType: hard -"@wdio/types@npm:8.16.3": - version: 8.16.3 - resolution: "@wdio/types@npm:8.16.3" +"@wdio/types@npm:8.16.7": + version: 8.16.7 + resolution: "@wdio/types@npm:8.16.7" dependencies: "@types/node": ^20.1.0 - checksum: c50be3244a80f24f905a16b58e1f2f45d8d00ba4304459386e0c00b3ee852e5a2ddcd0e2fffe35d38a4aa4bd33c65bae3f129203f69d343baa9a7c2b2a096381 + checksum: ac1aeeac85935319e8b87241574db0c19905c4c706205a81a33fa66a67e01a76fec4e0af96df7c160a17351de180c7f3eceaed6b1fc9d543f4533257577605fe languageName: node linkType: hard -"@wdio/utils@npm:8.16.3": - version: 8.16.3 - resolution: "@wdio/utils@npm:8.16.3" +"@wdio/utils@npm:8.16.7": + version: 8.16.7 + resolution: "@wdio/utils@npm:8.16.7" dependencies: "@puppeteer/browsers": ^1.6.0 "@wdio/logger": 8.11.0 - "@wdio/types": 8.16.3 + "@wdio/types": 8.16.7 decamelize: ^6.0.0 deepmerge-ts: ^5.1.0 edgedriver: ^5.3.5 @@ -1186,7 +1179,7 @@ __metadata: locate-app: ^2.1.0 safaridriver: ^0.1.0 wait-port: ^1.0.4 - checksum: bca49212218b69e9edd4af1142d16e8403b2918e70a630d5f7b2f408c65c2ac48faf5488aec26053d3c3550b73773e0ad9dbaeedcd49f2e31bab2e455e0863e0 + checksum: 0d064f85f4b436728751574f1993cc541f0c395c583cd6d90dd24f3410c66ed120a69b073b344de96bfaf4203109e1c6abbc9fe1f57a19f6fc7e297cc3cc6fb7 languageName: node linkType: hard @@ -2951,8 +2944,8 @@ __metadata: linkType: hard "edgedriver@npm:^5.3.5": - version: 5.3.6 - resolution: "edgedriver@npm:5.3.6" + version: 5.3.7 + resolution: "edgedriver@npm:5.3.7" dependencies: "@wdio/logger": ^8.11.0 decamelize: ^6.0.0 @@ -2962,7 +2955,7 @@ __metadata: which: ^4.0.0 bin: edgedriver: bin/edgedriver.js - checksum: 01d2477e6d05f3e797dee0f53beb38787cd79f958efc2c69fc47e66201b3ab0896d97eb337529d97501432c790197ff63528bb5bc6bfc79297d95c9306d0a976 + checksum: 57fb6e2fee696ed8a59ee9971143b31528f249be5c1287d6cc679ff7ba515bab6dfd6664aebdca238e3d19314f84f9e2ddec86265395adeebafeb8caa5bdb017 languageName: node linkType: hard @@ -3663,6 +3656,16 @@ __metadata: languageName: node linkType: hard +"fsevents@npm:2.3.2": + version: 2.3.2 + resolution: "fsevents@npm:2.3.2" + dependencies: + node-gyp: latest + checksum: 97ade64e75091afee5265e6956cb72ba34db7819b4c3e94c431d4be2b19b8bb7a2d4116da417950c3425f17c8fe693d25e20212cac583ac1521ad066b77ae31f + conditions: os=darwin + languageName: node + linkType: hard + "fsevents@npm:~2.3.2": version: 2.3.3 resolution: "fsevents@npm:2.3.3" @@ -3673,6 +3676,15 @@ __metadata: languageName: node linkType: hard +"fsevents@patch:fsevents@2.3.2#~builtin": + version: 2.3.2 + resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin::version=2.3.2&hash=df0bf1" + dependencies: + node-gyp: latest + conditions: os=darwin + languageName: node + linkType: hard + "fsevents@patch:fsevents@~2.3.2#~builtin": version: 2.3.3 resolution: "fsevents@patch:fsevents@npm%3A2.3.3#~builtin::version=2.3.3&hash=df0bf1" @@ -4028,11 +4040,11 @@ __metadata: linkType: hard "hosted-git-info@npm:^7.0.0": - version: 7.0.0 - resolution: "hosted-git-info@npm:7.0.0" + version: 7.0.1 + resolution: "hosted-git-info@npm:7.0.1" dependencies: lru-cache: ^10.0.1 - checksum: b892237a3867f827f97e229e2b6ddf17d3ed674f003475c12ecbfc6269416db3a643c1ee3c5d4a989e3f3a596dd1470ee4017fe911710e47aeb7d9319737c05e + checksum: be5280f0a20d6153b47e1ab578e09f5ae8ad734301b3ed7e547dc88a6814d7347a4888db1b4f9635cc738e3c0ef1fbff02272aba7d07c75d4c5a50ff8d618db6 languageName: node linkType: hard @@ -5673,7 +5685,7 @@ __metadata: languageName: node linkType: hard -"pac-proxy-agent@npm:^7.0.0": +"pac-proxy-agent@npm:^7.0.0, pac-proxy-agent@npm:^7.0.1": version: 7.0.1 resolution: "pac-proxy-agent@npm:7.0.1" dependencies: @@ -5835,23 +5847,27 @@ __metadata: languageName: node linkType: hard -"playwright-core@npm:1.37.1": - version: 1.37.1 - resolution: "playwright-core@npm:1.37.1" +"playwright-core@npm:1.38.0": + version: 1.38.0 + resolution: "playwright-core@npm:1.38.0" bin: playwright-core: cli.js - checksum: 69f818da2230057584140d5b3af7778a4f4a822b5b18d133abfc5d259128becb943c343a2ddf6b0635277a69f28983e83e2bc3fce23595ececb1e410475b6368 + checksum: 9eb43fc6c3cb392d5f35b0fd0b7291b38a8cbdc3cbb944a8261f744f30d09196dfa3b5d84aa02ffc09af87d08d31b385b007b6af20d0b6cd50a29344f3b0db8d languageName: node linkType: hard "playwright@npm:^1.22.2": - version: 1.37.1 - resolution: "playwright@npm:1.37.1" + version: 1.38.0 + resolution: "playwright@npm:1.38.0" dependencies: - playwright-core: 1.37.1 + fsevents: 2.3.2 + playwright-core: 1.38.0 + dependenciesMeta: + fsevents: + optional: true bin: playwright: cli.js - checksum: 99406ef3e15b83a659cb23ef1d92d9935789aad430580d1e0371087dfdf266891483c6f97cfa06bf5f49f081eacd44245d05d20714f98531edef4cc317044d6b + checksum: c5356690a391d5dd41f814d4e2694b93ba9e79381ce63de752da1c6c59b1f9c69bc6be853d973d0542d73a44a6b15f7c0081a164a64cd27b6b31207710c0ab34 languageName: node linkType: hard @@ -5949,6 +5965,22 @@ __metadata: languageName: node linkType: hard +"proxy-agent@npm:6.3.1": + version: 6.3.1 + resolution: "proxy-agent@npm:6.3.1" + dependencies: + agent-base: ^7.0.2 + debug: ^4.3.4 + http-proxy-agent: ^7.0.0 + https-proxy-agent: ^7.0.2 + lru-cache: ^7.14.1 + pac-proxy-agent: ^7.0.1 + proxy-from-env: ^1.1.0 + socks-proxy-agent: ^8.0.2 + checksum: 31030da419da31809340ac2521090c9a5bf4fe47a944843f829b3502883208c8586a468955e64b694140a41d70af6f45cf4793f5efd4a6f3ed94e5ac8023e36d + languageName: node + linkType: hard + "proxy-from-env@npm:1.1.0, proxy-from-env@npm:^1.1.0": version: 1.1.0 resolution: "proxy-from-env@npm:1.1.0" @@ -6209,28 +6241,28 @@ __metadata: linkType: hard "resolve@npm:^1.19.0": - version: 1.22.4 - resolution: "resolve@npm:1.22.4" + version: 1.22.5 + resolution: "resolve@npm:1.22.5" dependencies: is-core-module: ^2.13.0 path-parse: ^1.0.7 supports-preserve-symlinks-flag: ^1.0.0 bin: resolve: bin/resolve - checksum: 23f25174c2736ce24c6d918910e0d1f89b6b38fefa07a995dff864acd7863d59a7f049e691f93b4b2ee29696303390d921552b6d1b841ed4a8101f517e1d0124 + checksum: 6d8c8e414c0727341bc5b78d3806aa6730975d6c633ff266e90f3502ae1c10353d3535c9810aa94187a32ea192b9b3722afecac67487e27f44e60d89cca45cda languageName: node linkType: hard "resolve@patch:resolve@^1.19.0#~builtin": - version: 1.22.4 - resolution: "resolve@patch:resolve@npm%3A1.22.4#~builtin::version=1.22.4&hash=c3c19d" + version: 1.22.5 + resolution: "resolve@patch:resolve@npm%3A1.22.5#~builtin::version=1.22.5&hash=c3c19d" dependencies: is-core-module: ^2.13.0 path-parse: ^1.0.7 supports-preserve-symlinks-flag: ^1.0.0 bin: resolve: bin/resolve - checksum: c45f2545fdc4d21883861b032789e20aa67a2f2692f68da320cc84d5724cd02f2923766c5354b3210897e88f1a7b3d6d2c7c22faeead8eed7078e4c783a444bc + checksum: 8478df3911a3420450038b87aab4a6c66b91461035d901cd794076b46adfbf157fcfc8e83e3d0ef41a5956ce72ae166c33bd78432d6b41d43ee473b05c51cb32 languageName: node linkType: hard @@ -7296,36 +7328,36 @@ __metadata: languageName: node linkType: hard -"webdriver@npm:8.16.5": - version: 8.16.5 - resolution: "webdriver@npm:8.16.5" +"webdriver@npm:8.16.7": + version: 8.16.7 + resolution: "webdriver@npm:8.16.7" dependencies: "@types/node": ^20.1.0 "@types/ws": ^8.5.3 - "@wdio/config": 8.16.3 + "@wdio/config": 8.16.7 "@wdio/logger": 8.11.0 "@wdio/protocols": 8.16.5 - "@wdio/types": 8.16.3 - "@wdio/utils": 8.16.3 + "@wdio/types": 8.16.7 + "@wdio/utils": 8.16.7 deepmerge-ts: ^5.1.0 got: ^ 12.6.1 ky: ^0.33.0 ws: ^8.8.0 - checksum: 989185d0514f6226a77b890e4a595e42ee45e9c4a903cd2c78833f10f6e3e41b45809547498438348b82b6401f69576480cbd910816a35ddba1107d9e0730202 + checksum: e53546c5d330e93b21dfa1f970aed858d9c05408a2abab94196b6d51e9bbe2c3bcccd4f8e7e758cbec13148e31aabe4dd28050881d7aa09a336332d00610ab82 languageName: node linkType: hard "webdriverio@npm:^8.8.6": - version: 8.16.6 - resolution: "webdriverio@npm:8.16.6" + version: 8.16.7 + resolution: "webdriverio@npm:8.16.7" dependencies: "@types/node": ^20.1.0 - "@wdio/config": 8.16.3 + "@wdio/config": 8.16.7 "@wdio/logger": 8.11.0 "@wdio/protocols": 8.16.5 "@wdio/repl": 8.10.1 - "@wdio/types": 8.16.3 - "@wdio/utils": 8.16.3 + "@wdio/types": 8.16.7 + "@wdio/utils": 8.16.7 archiver: ^6.0.0 aria-query: ^5.0.0 css-shorthand-properties: ^1.1.1 @@ -7342,13 +7374,13 @@ __metadata: resq: ^1.9.1 rgb2hex: 0.2.5 serialize-error: ^11.0.1 - webdriver: 8.16.5 + webdriver: 8.16.7 peerDependencies: devtools: ^8.14.0 peerDependenciesMeta: devtools: optional: true - checksum: 86aff096d39f4df7bed39017df2c15d651f87652a97bb04d49e8cdec23fa2bf967317f90693a9858b8ac4e87f11eb08640084d96f5e05728d76434e781c4f44d + checksum: 6be1952f7ce4a87bf95ef2624f674a9f3d0f1483f91bf6bcec47f2766d496ba670aa564fad547695913439ffccc36b9a702e2922538cb0d128fa9ee4a39d5929 languageName: node linkType: hard From 5aff7f69e0d21a0422bcf6c276f7f63ffb0aedc0 Mon Sep 17 00:00:00 2001 From: Tom French Date: Fri, 15 Sep 2023 12:51:54 +0100 Subject: [PATCH 18/30] chore: remove `packageManager" fields from workspace packages --- tooling/noirc_abi_wasm/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/tooling/noirc_abi_wasm/package.json b/tooling/noirc_abi_wasm/package.json index fb5db6a97dc..00aee19aeed 100644 --- a/tooling/noirc_abi_wasm/package.json +++ b/tooling/noirc_abi_wasm/package.json @@ -21,7 +21,6 @@ "type": "git", "url": "https://github.com/noir-lang/noir.git" }, - "packageManager": "yarn@3.5.1", "scripts": { "build": "bash ./build.sh", "test": "env TS_NODE_COMPILER_OPTIONS='{\"module\": \"commonjs\" }' mocha", From 91379fd90b4cf08de434da4a03df2deb15f15a55 Mon Sep 17 00:00:00 2001 From: Tom French Date: Fri, 15 Sep 2023 13:09:36 +0100 Subject: [PATCH 19/30] chore: clean up straggler `packageManager` --- compiler/wasm/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/compiler/wasm/package.json b/compiler/wasm/package.json index 2c3463134e0..54f2c409c3e 100644 --- a/compiler/wasm/package.json +++ b/compiler/wasm/package.json @@ -14,7 +14,6 @@ "package.json" ], "sideEffects": false, - "packageManager": "yarn@3.5.1", "repository": { "type": "git", "url": "https://github.com/noir-lang/noir.git" From dbaf9de5d0c2da51715b736a5cce460d6462e63f Mon Sep 17 00:00:00 2001 From: Tom French Date: Fri, 15 Sep 2023 13:10:07 +0100 Subject: [PATCH 20/30] chore: pass full `package.json` into build artifact --- compiler/wasm/installPhase.sh | 6 +----- tooling/noirc_abi_wasm/installPhase.sh | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/compiler/wasm/installPhase.sh b/compiler/wasm/installPhase.sh index 17c86dac4d8..a71b3f8cd0e 100755 --- a/compiler/wasm/installPhase.sh +++ b/compiler/wasm/installPhase.sh @@ -3,10 +3,6 @@ export self_path=$(dirname "$(readlink -f "$0")") mkdir -p $out cp $self_path/README.md $out/ +cp $self_path/package.json $out/ cp -r $self_path/nodejs $out/ cp -r $self_path/web $out/ - -# The main package.json contains several keys which are incorrect/unwanted when distributing. -cat $self_path/package.json \ -| jq 'del(.private, .devDependencies, .scripts, .packageManager)' \ -> $out/package.json diff --git a/tooling/noirc_abi_wasm/installPhase.sh b/tooling/noirc_abi_wasm/installPhase.sh index 17c86dac4d8..a71b3f8cd0e 100755 --- a/tooling/noirc_abi_wasm/installPhase.sh +++ b/tooling/noirc_abi_wasm/installPhase.sh @@ -3,10 +3,6 @@ export self_path=$(dirname "$(readlink -f "$0")") mkdir -p $out cp $self_path/README.md $out/ +cp $self_path/package.json $out/ cp -r $self_path/nodejs $out/ cp -r $self_path/web $out/ - -# The main package.json contains several keys which are incorrect/unwanted when distributing. -cat $self_path/package.json \ -| jq 'del(.private, .devDependencies, .scripts, .packageManager)' \ -> $out/package.json From 10ed64869bff79a54aa07fda763f1194b42d9788 Mon Sep 17 00:00:00 2001 From: Tom French Date: Fri, 15 Sep 2023 13:23:00 +0100 Subject: [PATCH 21/30] chore(ci): fix playwright caching --- .github/workflows/abi_wasm.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/abi_wasm.yml b/.github/workflows/abi_wasm.yml index c60618168df..cf97f572f8d 100644 --- a/.github/workflows/abi_wasm.yml +++ b/.github/workflows/abi_wasm.yml @@ -94,6 +94,10 @@ jobs: run: | yarn workspace @noir-lang/noirc_abi test + - name: Query playwright version + working-directory: ./tooling/noirc_abi_wasm + run: echo "PLAYWRIGHT_VERSION=$(yarn info @web/test-runner-playwright --json | jq .children.Version)" >> $GITHUB_ENV + - name: Cache playwright binaries uses: actions/cache@v3 id: playwright-cache @@ -102,10 +106,6 @@ jobs: ~/.cache/ms-playwright key: ${{ runner.os }}-playwright-${{ env.PLAYWRIGHT_VERSION }} - - name: Query playwright version - working-directory: ./tooling/noirc_abi_wasm - run: echo "PLAYWRIGHT_VERSION=$(yarn info @web/test-runner-playwright --json | jq .children.Version)" >> $GITHUB_ENV - - name: Install playwright deps if: steps.playwright-cache.outputs.cache-hit != 'true' working-directory: ./tooling/noirc_abi_wasm From f344d75e7eb36961d7440c9dba4c0777724cc5c9 Mon Sep 17 00:00:00 2001 From: Tom French Date: Fri, 15 Sep 2023 14:08:14 +0100 Subject: [PATCH 22/30] chore: nits --- .github/workflows/abi_wasm.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/abi_wasm.yml b/.github/workflows/abi_wasm.yml index cf97f572f8d..34a6f039eec 100644 --- a/.github/workflows/abi_wasm.yml +++ b/.github/workflows/abi_wasm.yml @@ -95,8 +95,7 @@ jobs: yarn workspace @noir-lang/noirc_abi test - name: Query playwright version - working-directory: ./tooling/noirc_abi_wasm - run: echo "PLAYWRIGHT_VERSION=$(yarn info @web/test-runner-playwright --json | jq .children.Version)" >> $GITHUB_ENV + run: echo "PLAYWRIGHT_VERSION=$(yarn workspace noir-lang/noirc_abi_wasm info @web/test-runner-playwright --json | jq .children.Version) | trim -d '"'" >> $GITHUB_ENV - name: Cache playwright binaries uses: actions/cache@v3 @@ -108,13 +107,11 @@ jobs: - name: Install playwright deps if: steps.playwright-cache.outputs.cache-hit != 'true' - working-directory: ./tooling/noirc_abi_wasm run: | npx playwright install npx playwright install-deps - name: Run browser tests - working-directory: ./tooling/noirc_abi_wasm run: | yarn workspace @noir-lang/noirc_abi test:browser From ac801ee43d2378baf2c049c57c0e16ad2c9128dc Mon Sep 17 00:00:00 2001 From: Tom French Date: Fri, 15 Sep 2023 14:22:34 +0100 Subject: [PATCH 23/30] chore: fix version querying --- .github/workflows/abi_wasm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/abi_wasm.yml b/.github/workflows/abi_wasm.yml index 34a6f039eec..59b0dfda54b 100644 --- a/.github/workflows/abi_wasm.yml +++ b/.github/workflows/abi_wasm.yml @@ -95,7 +95,7 @@ jobs: yarn workspace @noir-lang/noirc_abi test - name: Query playwright version - run: echo "PLAYWRIGHT_VERSION=$(yarn workspace noir-lang/noirc_abi_wasm info @web/test-runner-playwright --json | jq .children.Version) | trim -d '"'" >> $GITHUB_ENV + run: echo "PLAYWRIGHT_VERSION=$(yarn workspace @noir-lang/noirc_abi info @web/test-runner-playwright --json | jq .children.Version | tr -d '"')" >> $GITHUB_ENV - name: Cache playwright binaries uses: actions/cache@v3 From 9647178da4cb4cc01aaa41f79b820486abd9bf44 Mon Sep 17 00:00:00 2001 From: Tom French Date: Fri, 15 Sep 2023 15:41:32 +0100 Subject: [PATCH 24/30] chore: remove reference to `result` directory --- tooling/noirc_abi_wasm/test/browser/abi_encode.test.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tooling/noirc_abi_wasm/test/browser/abi_encode.test.ts b/tooling/noirc_abi_wasm/test/browser/abi_encode.test.ts index 058c022ec65..2ca45d78f5c 100644 --- a/tooling/noirc_abi_wasm/test/browser/abi_encode.test.ts +++ b/tooling/noirc_abi_wasm/test/browser/abi_encode.test.ts @@ -1,5 +1,9 @@ import { expect } from "@esm-bundle/chai"; -import initNoirAbi, { abiEncode, abiDecode, WitnessMap } from "../../../../result"; +import initNoirAbi, { + abiEncode, + abiDecode, + WitnessMap, +} from "@noir-lang/noirc_abi"; import { DecodedInputs } from "../types"; beforeEach(async () => { @@ -12,7 +16,6 @@ it("recovers original inputs when abi encoding and decoding", async () => { const initial_witness: WitnessMap = abiEncode(abi, inputs, null); const decoded_inputs: DecodedInputs = abiDecode(abi, initial_witness); - expect(BigInt(decoded_inputs.inputs.foo)).to.be.equal(BigInt(inputs.foo)); expect(BigInt(decoded_inputs.inputs.bar[0])).to.be.equal( BigInt(inputs.bar[0]) @@ -21,4 +24,4 @@ it("recovers original inputs when abi encoding and decoding", async () => { BigInt(inputs.bar[1]) ); expect(decoded_inputs.return_value).to.be.null; -}); \ No newline at end of file +}); From 4e974cfce05eafc2109d086b41f8a010b21d6d3d Mon Sep 17 00:00:00 2001 From: Tom French Date: Fri, 15 Sep 2023 17:15:56 +0100 Subject: [PATCH 25/30] chore: fix merge --- .github/workflows/abi_wasm.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/workflows/abi_wasm.yml b/.github/workflows/abi_wasm.yml index c948385075b..5e17b51bbd6 100644 --- a/.github/workflows/abi_wasm.yml +++ b/.github/workflows/abi_wasm.yml @@ -90,15 +90,6 @@ jobs: with: name: noirc_abi_wasm path: ./tooling/noirc_abi_wasm - - - name: Checkout sources - uses: actions/checkout@v3 - - - name: Download noirc_abi_wasm package artifact - uses: actions/download-artifact@v3 - with: - name: noirc_abi_wasm - path: ./tooling/noirc_abi_wasm - name: Install Yarn dependencies uses: ./.github/actions/setup From 33675dd709644ed43d57b4e434f4b3a383016a52 Mon Sep 17 00:00:00 2001 From: Tom French Date: Fri, 15 Sep 2023 17:16:14 +0100 Subject: [PATCH 26/30] chore: fix merge --- .github/workflows/abi_wasm.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/abi_wasm.yml b/.github/workflows/abi_wasm.yml index 5e17b51bbd6..08ac27d5459 100644 --- a/.github/workflows/abi_wasm.yml +++ b/.github/workflows/abi_wasm.yml @@ -72,11 +72,6 @@ jobs: path: ${{ env.UPLOAD_PATH }} retention-days: 10 - noirc-abi-wasm-test: - needs: [noirc-abi-wasm-build] - runs-on: ubuntu-latest - - steps: test: runs-on: ubuntu-latest needs: [build] From 6f4cc8fd094788661e116fefb8f614a8451ead28 Mon Sep 17 00:00:00 2001 From: Tom French Date: Fri, 15 Sep 2023 17:19:00 +0100 Subject: [PATCH 27/30] chore: undo changes to playwright cache key --- .github/actions/install-playwright/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/install-playwright/action.yml b/.github/actions/install-playwright/action.yml index 5c9d560e5ff..ac412a7dd4a 100644 --- a/.github/actions/install-playwright/action.yml +++ b/.github/actions/install-playwright/action.yml @@ -6,7 +6,7 @@ runs: steps: - name: Query playwright version shell: bash - run: echo "PLAYWRIGHT_VERSION=$(yarn info @web/test-runner-playwright --json | jq .children.Version)" >> $GITHUB_ENV + run: echo "PLAYWRIGHT_VERSION=$(yarn workspace @noir-lang/noirc_abi info @web/test-runner-playwright --json | jq .children.Version | tr -d '"')" >> $GITHUB_ENV - name: Cache playwright binaries uses: actions/cache@v3 From b465812f5d2bd1823a5c4130d4125fcb98063be1 Mon Sep 17 00:00:00 2001 From: Tom French Date: Fri, 15 Sep 2023 17:32:47 +0100 Subject: [PATCH 28/30] chore: remove yarn poking --- .github/workflows/abi_wasm.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/abi_wasm.yml b/.github/workflows/abi_wasm.yml index 08ac27d5459..8f219a77977 100644 --- a/.github/workflows/abi_wasm.yml +++ b/.github/workflows/abi_wasm.yml @@ -89,9 +89,6 @@ jobs: - name: Install Yarn dependencies uses: ./.github/actions/setup - - name: poke Yarn - run: yarn install --immutable - - name: Run node tests run: yarn workspace @noir-lang/noirc_abi test From 05ead8b5b0975e5763a0db03c1f32ad89c319d23 Mon Sep 17 00:00:00 2001 From: Tom French Date: Fri, 15 Sep 2023 17:56:42 +0100 Subject: [PATCH 29/30] chore: revert changes to browser tests --- compiler/wasm/web-test-runner.config.mjs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/wasm/web-test-runner.config.mjs b/compiler/wasm/web-test-runner.config.mjs index 3fd65d56618..111c1ca627d 100644 --- a/compiler/wasm/web-test-runner.config.mjs +++ b/compiler/wasm/web-test-runner.config.mjs @@ -9,8 +9,8 @@ const reporter = process.env.CI ? summaryReporter() : defaultReporter(); export default { browsers: [ playwrightLauncher({ product: "chromium" }), - // playwrightLauncher({ product: "webkit" }), - // playwrightLauncher({ product: "firefox" }), + playwrightLauncher({ product: "webkit" }), + playwrightLauncher({ product: "firefox" }), ], plugins: [ esbuildPlugin({ From b7b4be7968d77b809da91780f49337418cddaf25 Mon Sep 17 00:00:00 2001 From: Tom French Date: Fri, 15 Sep 2023 18:11:55 +0100 Subject: [PATCH 30/30] chore: disable extra browsers again --- compiler/wasm/web-test-runner.config.mjs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/wasm/web-test-runner.config.mjs b/compiler/wasm/web-test-runner.config.mjs index 111c1ca627d..3fd65d56618 100644 --- a/compiler/wasm/web-test-runner.config.mjs +++ b/compiler/wasm/web-test-runner.config.mjs @@ -9,8 +9,8 @@ const reporter = process.env.CI ? summaryReporter() : defaultReporter(); export default { browsers: [ playwrightLauncher({ product: "chromium" }), - playwrightLauncher({ product: "webkit" }), - playwrightLauncher({ product: "firefox" }), + // playwrightLauncher({ product: "webkit" }), + // playwrightLauncher({ product: "firefox" }), ], plugins: [ esbuildPlugin({