Skip to content

Commit

Permalink
Merge branch 'master' into kw/compile-artifacts
Browse files Browse the repository at this point in the history
* master: (137 commits)
  chore: add `insert_range_check` method to `FunctionBuilder` (#3959)
  chore: remove usage of term "preprocessed" in favour of "artifact" (#3939)
  feat(lsp): goto trait from trait impl (#3956)
  fix: preserve brillig entrypoint functions without arguments (#3951)
  feat: implement `Eq` trait on curve points (#3944)
  chore: fixing links to the blackbox functions (#3941)
  feat(lsp): cache definitions for goto requests (#3930)
  feat: remove range constraints from witnesses which are constrained to be constants (#3928)
  fix: implement missing codegen for `BlackBoxFunc::EcdsaSecp256r1` in brillig (#3943)
  chore(debugger): Integration tests (#3938)
  fix: handle multiple imports in the same file (#3903)
  feat: add foreign call support to `noir_codegen` functions (#3933)
  feat: Implement Operator Overloading (#3931)
  chore: fix casing on `InternalError::Unexpected` (#3937)
  chore: add test case for brillig array equality assertion (#3936)
  feat(lsp): goto struct member inside Impl method (#3918)
  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)
  ...
  • Loading branch information
TomAFrench committed Jan 5, 2024
2 parents 5810a5c + 043d03d commit 4794923
Show file tree
Hide file tree
Showing 741 changed files with 17,916 additions and 20,840 deletions.
6 changes: 1 addition & 5 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ packages
**/node_modules
**/outputs

# Source resolver
compiler/source-resolver/lib
compiler/source-resolver/lib-node

# Noir.js
tooling/noir_js/lib

Expand All @@ -19,4 +15,4 @@ compiler/wasm/nodejs
compiler/wasm/web
tooling/noirc_abi_wasm/nodejs
tooling/noirc_abi_wasm/web
tooling/noir_js/lib
tooling/noir_js/lib
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
12 changes: 6 additions & 6 deletions .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ description: Installs the workspace's yarn dependencies and caches them
runs:
using: composite
steps:
- name: Cache
uses: actions/cache@v3
id: cache
- uses: actions/setup-node@v3
id: node
with:
path: "**/node_modules"
key: yarn-v1-${{ hashFiles('**/yarn.lock') }}
node-version: 18.17.1
cache: 'yarn'
cache-dependency-path: 'yarn.lock'

- name: Install
run: yarn --immutable
shell: bash
if: steps.cache.outputs.cache-hit != 'true'
107 changes: 0 additions & 107 deletions .github/workflows/acir-artifacts.yml

This file was deleted.

45 changes: 0 additions & 45 deletions .github/workflows/build-aztec-feature-flag.yml

This file was deleted.

10 changes: 2 additions & 8 deletions .github/workflows/publish-acvm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +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
env:
CARGO_REGISTRY_TOKEN: ${{ secrets.ACVM_CRATES_IO_TOKEN }}

- name: Publish acvm_stdlib
run: |
cargo publish --package acvm_stdlib
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
5 changes: 0 additions & 5 deletions .github/workflows/publish-es-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,6 @@ jobs:
nix-cache-name: "noir"
cachix-auth-token: ${{ secrets.CACHIXAUTHTOKEN }}

- name: Enable aztec features
if: ${{ inputs.npm-tag == 'aztec' }}
run: |
echo $'\n'"default = [\"aztec\"]"$'\n' >> compiler/noirc_driver/Cargo.toml
- name: Build wasm package
run: |
nix build -L .#noir_wasm
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/publish-nargo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ jobs:
strategy:
matrix:
target: [x86_64-apple-darwin, aarch64-apple-darwin]
timeout-minutes: 30

steps:
- name: Checkout
Expand Down Expand Up @@ -120,6 +121,7 @@ jobs:
fail-fast: false
matrix:
target: [x86_64-unknown-linux-gnu, x86_64-unknown-linux-musl]
timeout-minutes: 30

steps:
- name: Checkout
Expand Down
57 changes: 9 additions & 48 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ jobs:
outputs:
release-pr: ${{ steps.release.outputs.pr }}
tag-name: ${{ steps.release.outputs.tag_name }}
pending-release-semver: v${{ steps.release.outputs.major }}.${{steps.release.outputs.minor}}.${{steps.release.outputs.patch}}
runs-on: ubuntu-latest
steps:
- name: Run release-please
Expand Down Expand Up @@ -39,35 +40,9 @@ jobs:
run: |
./scripts/update-acvm-workspace-versions.sh
- name: Configure git
run: |
git config user.name kevaundray
git config user.email kevtheappdev@gmail.com
- name: Commit updates
run: |
git add Cargo.toml
git commit -m 'chore: Update root workspace acvm versions'
git push
update-lockfile:
name: Update lockfile
needs: [release-please,update-acvm-workspace-package-versions]
if: ${{ needs.release-please.outputs.release-pr }}
runs-on: ubuntu-latest
steps:
- name: Checkout release branch
uses: actions/checkout@v4
with:
ref: ${{ fromJSON(needs.release-please.outputs.release-pr).headBranchName }}
token: ${{ secrets.NOIR_RELEASES_TOKEN }}

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

- name: Update lockfile
run: |
cargo update --workspace
cargo update --workspace
- name: Configure git
run: |
Expand All @@ -76,15 +51,16 @@ jobs:
- name: Commit updates
run: |
git add Cargo.lock
git commit -m 'chore: Update lockfile'
git add .
git commit -m 'chore: Update root workspace acvm versions and lockfile'
git push
update-docs:
name: Update docs
needs: [release-please, update-lockfile]
if: ${{ needs.release-please.outputs.tag-name }}
needs: [release-please, update-acvm-workspace-package-versions]
if: ${{ needs.release-please.outputs.release-pr }}
runs-on: ubuntu-latest

steps:
- name: Checkout release branch
uses: actions/checkout@v4
Expand All @@ -102,7 +78,7 @@ jobs:

- name: Cut a new version
working-directory: ./docs
run: yarn docusaurus docs:version ${{ needs.release-please.outputs.tag-name }}
run: yarn docusaurus docs:version ${{ needs.release-please.outputs.pending-release-semver }}

- name: Configure git
run: |
Expand All @@ -112,7 +88,7 @@ jobs:
- name: Commit new documentation version
run: |
git add .
git commit -m "chore(docs): cut new docs version for tag ${{ needs.release-please.outputs.tag-name }}"
git commit -m "chore(docs): cut new docs version for tag ${{ needs.release-please.outputs.pending-release-semver }}"
git push
build-binaries:
Expand Down Expand Up @@ -144,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
Loading

0 comments on commit 4794923

Please sign in to comment.