Skip to content

Commit

Permalink
Merge branch 'master' into jb-test-solidity-verifier
Browse files Browse the repository at this point in the history
* master: (28 commits)
  chore: add `CRS` directory to gitignore (#2852)
  chore: add initial version of `Backend` interface for `noir_js` (#2851)
  chore(errors): Refactor errors representation in compiler (#2760)
  chore(ci): run `noir_js` tests in CI (#2843)
  chore(noir_js)!: Rename inner and outer proof methods (#2845)
  chore: remove unnecessary `AcirValue`s (#2823)
  fix: Conditionally run the "Create or Update PR" step in acir artifacts rebuild workflow (#2849)
  fix: lack of cjs package version (#2848)
  chore: delete unnecessary nix files (#2840)
  chore!: `generateWitness` now returns a serialized witness file (#2842)
  chore: fix `acvm_js` linting and tests (#2834)
  feat: remove redundant predicate from brillig quotients (#2784)
  chore: Fix dependencies in acvm_js and remove local lock file (#2833)
  chore: add acvm_js to integration build
  chore: update discord link (#2831)
  chore: discard changes in nargo directory
  chore: Update ACIR artifacts (#2810)
  chore: yarn install
  chore: Remove acvm tracking workflow (#2829)
  add acvm_js to workspace
  ...
  • Loading branch information
TomAFrench committed Sep 26, 2023
2 parents 5400eb7 + 75e8581 commit ec01bfc
Show file tree
Hide file tree
Showing 122 changed files with 1,522 additions and 9,752 deletions.
5 changes: 0 additions & 5 deletions .github/workflows/abi_wasm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,6 @@ jobs:
cp -r ./result/noirc_abi_wasm/nodejs ./tooling/noirc_abi_wasm
cp -r ./result/noirc_abi_wasm/web ./tooling/noirc_abi_wasm
- name: Export cache from nix store
if: ${{ steps.cache.outputs.cache-hit != 'true' && github.event_name != 'merge_group' }}
run: |
nix copy --to "file://${{ env.CACHED_PATH }}?compression=zstd&parallel-compression=true" .#noirc-abi-wasm-cargo-artifacts
- name: Dereference symlink
run: echo "UPLOAD_PATH=$(readlink -f ./result/noirc_abi_wasm)" >> $GITHUB_ENV

Expand Down
8 changes: 0 additions & 8 deletions .github/workflows/acvm-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,56 +24,48 @@ jobs:

# These steps are in a specific order so crate dependencies are updated first
- name: Publish acir_field
working-directory: acvm-repo
run: |
cargo publish --package acir_field
env:
CARGO_REGISTRY_TOKEN: ${{ secrets.ACVM_CRATES_IO_TOKEN }}

- name: Publish brillig
working-directory: acvm-repo
run: |
cargo publish --package brillig
env:
CARGO_REGISTRY_TOKEN: ${{ secrets.ACVM_CRATES_IO_TOKEN }}

- name: Publish acir
working-directory: acvm-repo
run: |
cargo publish --package acir
env:
CARGO_REGISTRY_TOKEN: ${{ secrets.ACVM_CRATES_IO_TOKEN }}

- name: Publish acvm_blackbox_solver
working-directory: acvm-repo
run: |
cargo publish --package acvm_blackbox_solver
env:
CARGO_REGISTRY_TOKEN: ${{ secrets.ACVM_CRATES_IO_TOKEN }}

- name: Publish barretenberg_blackbox_solver
working-directory: acvm-repo
run: |
cargo publish --package barretenberg_blackbox_solver
env:
CARGO_REGISTRY_TOKEN: ${{ secrets.ACVM_CRATES_IO_TOKEN }}

- name: Publish acvm_stdlib
working-directory: acvm-repo
run: |
cargo publish --package acvm_stdlib
env:
CARGO_REGISTRY_TOKEN: ${{ secrets.ACVM_CRATES_IO_TOKEN }}

- name: Publish brillig_vm
working-directory: acvm-repo
run: |
cargo publish --package brillig_vm
env:
CARGO_REGISTRY_TOKEN: ${{ secrets.ACVM_CRATES_IO_TOKEN }}

- name: Publish acvm
working-directory: acvm-repo
run: |
cargo publish --package acvm
env:
Expand Down
47 changes: 0 additions & 47 deletions .github/workflows/acvm-release.yml

This file was deleted.

43 changes: 0 additions & 43 deletions .github/workflows/acvm-rust.yml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,10 @@ jobs:
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"

- name: Build acvm-js
working-directory: acvm-repo
run: |
nix build .#
nix build -L .#acvm_js
- name: Dereference symlink
working-directory: acvm-repo
run: echo "UPLOAD_PATH=$(readlink -f result)" >> $GITHUB_ENV

- name: Upload artifact
Expand All @@ -53,18 +51,18 @@ jobs:
uses: actions/download-artifact@v3
with:
name: acvm-js
path: ./acvm-repo/result
path: ./result

- name: Move build artifacts
run: |
mv ./result/acvm_js/nodejs ./acvm-repo/acvm_js/nodejs
mv ./result/acvm_js/web ./acvm-repo/acvm_js/web
- name: Set up test environment
uses: ./.github/actions/setup
with:
working-directory: ./acvm-repo/acvm_js

- name: Run node tests
working-directory: ./acvm-repo/acvm_js
run: |
yarn
yarn test
run: yarn workspace @noir-lang/acvm_js test

test-acvm_js-browser:
needs: [build-acvm-js-package]
Expand All @@ -79,42 +77,21 @@ jobs:
uses: actions/download-artifact@v3
with:
name: acvm-js
path: ./acvm-repo/result
path: ./result

- name: Move build artifacts
run: |
mv ./result/acvm_js/nodejs ./acvm-repo/acvm_js/nodejs
mv ./result/acvm_js/web ./acvm-repo/acvm_js/web
- name: Set up test environment
uses: ./.github/actions/setup
with:
working-directory: ./acvm-repo/acvm_js

- name: Install playwright deps
working-directory: ./acvm-repo/acvm_js
run: |
npx playwright install
npx playwright install-deps
- name: Run browser tests
working-directory: ./acvm-repo/acvm_js
run: |
yarn
yarn test:browser
test-acvm_js-rust:
name: Rust Tests
runs-on: ubuntu-latest

steps:
- name: Checkout sources
uses: actions/checkout@v4

- name: Setup toolchain
uses: dtolnay/rust-toolchain@1.66.0
with:
targets: wasm32-unknown-unknown

- uses: taiki-e/install-action@v2
with:
tool: wasm-bindgen-cli@0.2.87

- name: Run rust tests
working-directory: acvm-repo
run: cargo test
run: yarn workspace @noir-lang/acvm_js test:browser
28 changes: 0 additions & 28 deletions .github/workflows/acvm-typescript.yml

This file was deleted.

12 changes: 9 additions & 3 deletions .github/workflows/auto-pr-rebuild-script.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,19 +62,25 @@ jobs:
- name: Set up Git user (Github Action)
run: |
git config --local user.email "action@github.com"
git config --local user.name "GitHub Action"
git config --local user.name kevaundray
git config --local user.email kevtheappdev@gmail.com
- name: Run rebuild script
working-directory: tooling/nargo_cli/tests
run: |
chmod +x ./rebuild.sh
./rebuild.sh
- name: Check for changes in acir_artifacts directory
id: check_changes
run: |
git diff --quiet tooling/nargo_cli/tests/acir_artifacts/ || echo "::set-output name=changes::true"
- name: Create or Update PR
if: steps.check_changes.outputs.changes == 'true'
uses: peter-evans/create-pull-request@v3
with:
token: ${{ secrets.GITHUB_TOKEN }}
token: ${{ secrets.NOIR_REPO_TOKEN }}
commit-message: "chore: update acir artifacts"
title: "chore: Update ACIR artifacts"
body: "Automatic PR to update acir artifacts"
Expand Down
26 changes: 26 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,3 +117,29 @@ jobs:
repo: ${{ github.repository }}
token: ${{ secrets.GITHUB_TOKEN }}
inputs: '{ "noir-ref": "${{ needs.release-please.outputs.tag-name }}" }'

publish-acvm:
name: Publish crates
needs: [release-please]
if: ${{ needs.release-please.outputs.tag-name }}
runs-on: ubuntu-latest
steps:
- name: Dispatch to publish workflow
uses: benc-uk/workflow-dispatch@v1
with:
workflow: acvm-publish.yml
ref: master
inputs: '{ "acvm-ref": "${{ needs.release-please.outputs.tag-name }}" }'

dispatch-publish-acvm-js:
name: Dispatch to publish-acvm-js workflow
needs: [release-please]
if: ${{ needs.release-please.outputs.tag-name }}
runs-on: ubuntu-latest
steps:
- name: Trigger publish-acvm-js.yml workflow
uses: benc-uk/workflow-dispatch@v1
with:
workflow: acvm-publish-acvm-js.yml
ref: master
inputs: '{ "acvm-ref": "${{ needs.release-please.outputs.tag-name }}" }'
1 change: 1 addition & 0 deletions .github/workflows/test-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ jobs:
- name: Setup `integration-tests`
run: |
yarn workspace @noir-lang/source-resolver build
yarn workspace @noir-lang/acvm_js build
yarn workspace @noir-lang/noir_js build
- name: Run `integration-tests`
Expand Down
Loading

0 comments on commit ec01bfc

Please sign in to comment.