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.

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: switch noir pull to master branch #4581

Merged
merged 4 commits into from
Feb 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 17 additions & 17 deletions avm-transpiler/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions noir/.github/actions/install-playwright/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,5 @@ runs:
- name: Install playwright deps
shell: bash
if: steps.playwright-cache.outputs.cache-hit != 'true'
run: |
npx playwright install
npx playwright install-deps
run: ./.github/scripts/playwright-install.sh

2 changes: 1 addition & 1 deletion noir/.github/scripts/acvm_js-test-browser.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
set -eu

npx playwright install && npx playwright install-deps
./.github/scripts/playwright-install.sh
yarn workspace @noir-lang/acvm_js test:browser
4 changes: 4 additions & 0 deletions noir/.github/scripts/cargo-binstall-install.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env bash
set -eu

curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
2 changes: 1 addition & 1 deletion noir/.github/scripts/integration-test-browser.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
set -eu

npx playwright install && npx playwright install-deps
./.github/scripts/playwright-install.sh
yarn workspace integration-tests test
6 changes: 3 additions & 3 deletions noir/.github/scripts/noir-wasm-test-browser.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
set -eu

./scripts/nargo_compile_wasm_fixtures.sh
npx playwright install && npx playwright install-deps
yarn workspace @noir-lang/noir_wasm test:browser
./.github/scripts/playwright-install.sh
yarn workspace @noir-lang/noir_wasm test:build_fixtures
yarn workspace @noir-lang/noir_wasm test:browser
4 changes: 2 additions & 2 deletions noir/.github/scripts/noir-wasm-test.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
set -eu

./scripts/nargo_compile_wasm_fixtures.sh
yarn workspace @noir-lang/noir_wasm test:build_fixtures
yarn workspace @noir-lang/noir_wasm test:node
npx playwright install && npx playwright install-deps
./.github/scripts/playwright-install.sh
yarn workspace @noir-lang/noir_wasm test:browser
2 changes: 1 addition & 1 deletion noir/.github/scripts/noirc-abi-test-browser.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
set -eu

npx playwright install && npx playwright install-deps
./.github/scripts/playwright-install.sh
yarn workspace @noir-lang/noirc_abi test:browser
4 changes: 4 additions & 0 deletions noir/.github/scripts/playwright-install.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash
set -eu

npx playwright install && npx playwright install-deps
14 changes: 11 additions & 3 deletions noir/.github/scripts/wasm-bindgen-install.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
#!/bin/bash
#!/usr/bin/env bash
set -eu

# TODO call this script directly
./scripts/install_wasm-bindgen.sh
cd $(dirname "$0")

./cargo-binstall-install.sh

# Install wasm-bindgen-cli.
if [ "$(wasm-bindgen --version | cut -d' ' -f2)" != "0.2.86" ]; then
echo "Building wasm-bindgen..."
cargo binstall wasm-bindgen-cli@0.2.86 --force --no-confirm
fi

5 changes: 4 additions & 1 deletion noir/.github/scripts/wasm-pack-install.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/bin/bash
set -eu

curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
cd $(dirname "$0")

./cargo-binstall-install.sh

cargo-binstall wasm-pack --version 0.12.1 -y
2 changes: 1 addition & 1 deletion noir/.github/workflows/docker-test-flow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -805,4 +805,4 @@ jobs:
exit 0
fi
env:
FAIL: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'skipped') }}
FAIL: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') || contains(needs.*.result, 'skipped') }}
8 changes: 0 additions & 8 deletions noir/.github/workflows/docs-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,6 @@ jobs:
- name: Setup toolchain
uses: dtolnay/rust-toolchain@1.71.1

- uses: Swatinem/rust-cache@v2
with:
key: x86_64-unknown-linux-gnu
save-if: false

- name: Setup toolchain
uses: dtolnay/rust-toolchain@1.71.1

- uses: Swatinem/rust-cache@v2
with:
key: x86_64-unknown-linux-gnu
Expand Down
1 change: 1 addition & 0 deletions noir/.github/workflows/publish-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
branches:
- master
paths: [docs/**]
workflow_dispatch:

jobs:
publish-docs:
Expand Down
8 changes: 3 additions & 5 deletions noir/.github/workflows/test-js-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -183,10 +183,8 @@ jobs:
- name: Set up test environment
uses: ./.github/actions/setup

- name: Install playwright deps
run: |
npx playwright install
npx playwright install-deps
- name: Install Playwright
run: ./.github/scripts/playwright-install.sh

- name: Run browser tests
run: yarn workspace @noir-lang/acvm_js test:browser
Expand Down Expand Up @@ -516,4 +514,4 @@ jobs:
fi
env:
# We treat any skipped or failing jobs as a failure for the workflow as a whole.
FAIL: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'skipped') }}
FAIL: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') || contains(needs.*.result, 'skipped') }}
5 changes: 3 additions & 2 deletions noir/.github/workflows/test-rust-workspace.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ jobs:
runs-on: ubuntu-latest
needs: [build-test-artifacts]
strategy:
fail-fast: false
matrix:
partition: [1, 2, 3, 4]
steps:
Expand Down Expand Up @@ -95,5 +96,5 @@ jobs:
exit 0
fi
env:
# We treat any skipped or failing jobs as a failure for the workflow as a whole.
FAIL: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'skipped') }}
# We treat any cancelled, skipped or failing jobs as a failure for the workflow as a whole.
FAIL: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') || contains(needs.*.result, 'skipped') }}
6 changes: 3 additions & 3 deletions noir/.gitrepo
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
;
[subrepo]
remote = https://github.com/noir-lang/noir
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note for others, this history matters a LOT less now that we just squash changes into Noir. Originally we replayed commit by commit history, but as this was going into bulk PRs anyway it's not the most worthwhile complexity tradeoff. The only reason this should be updating now is on pulls

branch = aztec-packages
commit = 6ff518af281afe601edb8574d425b07d9d2f9c5d
parent = 2082fedfb03d4882a269881f51c5337263bc539b
branch = master
commit = 78ef0134b82e76a73dadb6c7975def22290e3a1a
parent = e23d048e916fa12966fe01d1a8c0d3bfb50c2943
method = merge
cmdver = 0.4.6
4 changes: 2 additions & 2 deletions noir/.release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
".": "0.23.0",
"acvm-repo": "0.39.0"
".": "0.24.0",
"acvm-repo": "0.40.0"
}
Loading
Loading