Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: noir sync (AztecProtocol#3884)
Browse files Browse the repository at this point in the history
Needed a bit of a graft here:
- Looked at current commit on noir/.gitrepo, it pointed to 'just nargo
compile' commit, fixed that to actual commit in aztec-packages branch of
noir
- Fixed parent commit
- did git subrepo noir pull and fixed merge conflicts per instructions
- this PR resulted
ludamad authored Jan 8, 2024

Verified

This commit was signed with the committer’s verified signature.
frapell Franco Pellegrini
1 parent fa1c456 commit 217de09
Showing 454 changed files with 6,079 additions and 1,985 deletions.
4 changes: 2 additions & 2 deletions noir/.github/workflows/publish-acvm.yml
Original file line number Diff line number Diff line change
@@ -45,9 +45,9 @@ jobs:
env:
CARGO_REGISTRY_TOKEN: ${{ secrets.ACVM_CRATES_IO_TOKEN }}

- name: Publish barretenberg_blackbox_solver
- name: Publish bn254_blackbox_solver
run: |
cargo publish --package barretenberg_blackbox_solver
cargo publish --package bn254_blackbox_solver
env:
CARGO_REGISTRY_TOKEN: ${{ secrets.ACVM_CRATES_IO_TOKEN }}

13 changes: 4 additions & 9 deletions noir/.github/workflows/publish-docs.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
name: Publish documentation

on:
workflow_dispatch:
inputs:
noir-ref:
description: The noir reference to checkout
required: false
default: 'master'
push:
branches:
- master
paths: [docs/**]

jobs:
publish-docs:
@@ -16,9 +14,6 @@ jobs:
steps:
- name: Checkout release branch
uses: actions/checkout@v4
with:
ref: ${{ inputs.noir-ref }}
token: ${{ secrets.NOIR_RELEASES_TOKEN }}

- name: Setup Node.js
uses: actions/setup-node@v2
15 changes: 0 additions & 15 deletions noir/.github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -120,21 +120,6 @@ jobs:
token: ${{ secrets.NOIR_REPO_TOKEN }}
inputs: '{ "noir-ref": "${{ needs.release-please.outputs.tag-name }}", "npm-tag": "latest" }'

publish-docs:
name: Publish docs
needs: [release-please]
if: ${{ needs.release-please.outputs.tag-name }}
runs-on: ubuntu-latest

steps:
- name: Dispatch to publish-docs
uses: benc-uk/workflow-dispatch@v1
with:
workflow: publish-docs.yml
ref: master
token: ${{ secrets.NOIR_REPO_TOKEN }}
inputs: '{ "noir-ref": "${{ needs.release-please.outputs.tag-name }}" }'

publish-acvm:
name: Publish acvm
needs: [release-please]
32 changes: 29 additions & 3 deletions noir/.github/workflows/spellcheck.yml
Original file line number Diff line number Diff line change
@@ -8,6 +8,32 @@ concurrency:
cancel-in-progress: true

jobs:
spellcheck:
name: Spellcheck
uses: noir-lang/.github/.github/workflows/spellcheck.yml@main
code:
name: Code
runs-on: ubuntu-latest
steps:
- name: Checkout sources
uses: actions/checkout@v4

- name: Check spelling
uses: streetsidesoftware/cspell-action@v2
with:
strict: false # Do not fail, if a spelling mistake is found (This can be annoying for contributors)
incremental_files_only: true # Run this action on files which have changed in PR
files: |
**/*.{md,rs}
docs:
name: Documentation
runs-on: ubuntu-latest
steps:
- name: Checkout sources
uses: actions/checkout@v4

- name: Check spelling
uses: streetsidesoftware/cspell-action@v2
with:
strict: true # Documentation has higher standards for correctness.
incremental_files_only: true # Run this action on files which have changed in PR
files: |
./docs/**/*.md
4 changes: 2 additions & 2 deletions noir/.gitrepo
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
[subrepo]
remote = https://github.com/noir-lang/noir
branch = aztec-packages
commit = a0e2ac5319abca5259c5823f7b037b6eb693e5b6
parent = 3d08ef9d828b81ddb1fc6e9aebae6896fe4ee946
commit = 50cb28c7ae8dff415cdf86c67445e6dcd72c41a5
parent = d2ae2cd529b0ef132c0b6c7c35938066c89d809c
method = merge
cmdver = 0.4.6
4 changes: 4 additions & 0 deletions noir/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -92,6 +92,10 @@ This strategy avoids scenarios where pull requests grow too large/out-of-scope a

The easiest way to do this is to have multiple Conventional Commits while you work and then you can cherry-pick the smaller changes into separate branches for pull requesting.

### Typos and other small changes

Significant changes, like new features or important bug fixes, typically have a more pronounced impact on the project’s overall development. For smaller fixes, such as typos, we encourage you to report them instead of opening PRs. This approach helps us manage our resources effectively and ensures that every change contributes meaningfully to the project. PRs involving such smaller fixes will likely be closed and incorporated in PRs authored by the core team.

### Reviews

For any repository in the noir-lang organization, we require code review & approval by __one__ Noir team member before the changes are merged, as enforced by GitHub branch protection. Non-breaking pull requests may be merged at any time. Breaking pull requests should only be merged when the team has general agreement of the changes and is preparing a breaking release.
Loading

0 comments on commit 217de09

Please sign in to comment.