Skip to content

Commit

Permalink
Merge branch 'master' into tf/function-exports
Browse files Browse the repository at this point in the history
* master: (48 commits)
  chore: fix broken links (#3935)
  chore: updated ACIR documentation and other docs (#3932)
  chore: rename "syntax" chapter in docs to "concepts" (#3934)
  fix: checks for cyclic dependencies (#3699)
  fix(debugger): crash when stepping through locations spanning multiple lines (#3920)
  chore: abstract away subtractions from `OR` implementation (#3923)
  chore: fix `should_fail_mismatch` test to use correct pedersen return type (#3927)
  fix: prevent `Instruction::Constrain`s for non-primitive types (#3916)
  feat: remove unnecessary predicate from `Lt` instruction (#3922)
  feat: simplify multiplications by `0` or `1` in ACIR gen (#3924)
  chore: bump dependency versions (#3925)
  chore: Update CONTRIBUTING.md (#3921)
  chore: Optimize goto_definitions for workspace case (#3914)
  chore: Update index.md (#3911)
  chore: Update index.md (#3910)
  chore: Update how-to-recursion.md (#3912)
  feat: Resolve oracle calls via JSON-RPC (#3902)
  chore: Update explainer-recursion.md (#3906)
  chore: remove unnecessary dependency (#3901)
  chore: improve package.json metadata (#3900)
  ...
  • Loading branch information
TomAFrench committed Jan 3, 2024
2 parents 4705b35 + 6b078b4 commit 7d782f2
Show file tree
Hide file tree
Showing 387 changed files with 4,242 additions and 1,485 deletions.
2 changes: 1 addition & 1 deletion .github/actions/docs/build-status/script.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

BRANCH_NAME=$(echo "$BRANCH_NAME" | sed -e "s#refs/[^/]*/##")
DEPLOY_STATUS=$(curl -X GET "https://api.netlify.com/api/v1/sites/$SITE_ID/deploys?branch=$BRANCH_NAME" | jq -r '.[] | select(.created_at != null) | .state' | head -1)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-acvm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down
13 changes: 4 additions & 9 deletions .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:
Expand All @@ -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
Expand Down
15 changes: 0 additions & 15 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
32 changes: 29 additions & 3 deletions .github/workflows/spellcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: 4 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Loading

0 comments on commit 7d782f2

Please sign in to comment.