Skip to content

Commit

Permalink
Merge branch 'master' into kh-update-nix
Browse files Browse the repository at this point in the history
* master: (40 commits)
  chore(noir): Release (master) (#2859)
  chore: remove rebuild script since its failing
  chore(ci): rename CI workflows based on theme (#2853)
  chore(noir): Release (master) (#2827)
  chore: add solidity verifier workflow (#2749)
  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)
  ...
  • Loading branch information
TomAFrench committed Sep 27, 2023
2 parents f938fa0 + b8d9c34 commit d9bfb6d
Show file tree
Hide file tree
Showing 162 changed files with 2,815 additions and 10,146 deletions.
2 changes: 1 addition & 1 deletion .github/NIGHTLY_TEST_FAILURE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: "nightly test-integration failed"
assignees: kobyhallx, phated, tomafrench, jonybur
assignees: kobyhallx, tomafrench, jonybur
labels: bug
---

Expand Down
47 changes: 0 additions & 47 deletions .github/workflows/acvm-release.yml

This file was deleted.

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

This file was deleted.

28 changes: 0 additions & 28 deletions .github/workflows/acvm-typescript.yml

This file was deleted.

83 changes: 0 additions & 83 deletions .github/workflows/auto-pr-rebuild-script.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/publish-abi_wasm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,6 @@ jobs:
- name: Publish to npm
working-directory: ./temp_publish_dir
run: |
npm publish --tag latest
yarn npm publish --tag latest
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
File renamed without changes.
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
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@ jobs:

- name: Publish to NPM
working-directory: ./tooling/noir_js
run: npm publish --access public
run: yarn npm publish --access public
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: Release and Publish Source Resolver
name: Publish Source Resolver

on:
workflow_dispatch:

jobs:
release-source-resolver:
name: Release and Publish Source Resolver
name: Publish Source Resolver
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand All @@ -19,6 +19,6 @@ jobs:

- name: Publish to NPM
working-directory: ./compiler/source-resolver
run: npm publish
run: yarn npm publish
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
File renamed without changes.
36 changes: 31 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
- name: Dispatch to publish workflow
uses: benc-uk/workflow-dispatch@v1
with:
workflow: publish.yml
workflow: publish-nargo.yml
repo: noir-lang/noir
ref: master
token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -74,7 +74,7 @@ jobs:
- name: Dispatch to noir_wasm
uses: benc-uk/workflow-dispatch@v1
with:
workflow: release-noir-wasm.yml
workflow: publish-noir-wasm.yml
ref: master
token: ${{ secrets.NOIR_REPO_TOKEN }}

Expand All @@ -87,7 +87,7 @@ jobs:
- name: Dispatch to noir_wasm
uses: benc-uk/workflow-dispatch@v1
with:
workflow: noir-js.yml
workflow: publish-noir-js.yml
ref: master
token: ${{ secrets.NOIR_REPO_TOKEN }}

Expand All @@ -100,11 +100,11 @@ jobs:
- name: Dispatch to source resolver
uses: benc-uk/workflow-dispatch@v1
with:
workflow: release-source-resolver.yml
workflow: publish-source-resolver.yml
ref: master
token: ${{ secrets.NOIR_REPO_TOKEN }}

dispatch-publish-abi-wasm:
publish-abi-wasm:
name: Dispatch to publish-abi_wasm workflow
needs: [release-please]
if: ${{ needs.release-please.outputs.tag-name }}
Expand All @@ -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: publish-acvm.yml
ref: master
inputs: '{ "acvm-ref": "${{ needs.release-please.outputs.tag-name }}" }'

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: publish-acvm-js.yml
ref: master
inputs: '{ "acvm-ref": "${{ needs.release-please.outputs.tag-name }}" }'
Loading

0 comments on commit d9bfb6d

Please sign in to comment.