Skip to content

Commit

Permalink
Merge branch 'master' into tf/export-ts-solvers
Browse files Browse the repository at this point in the history
* master: (31 commits)
  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
  - remove acvm-eslint - rename acvm-test to acvm-js-test
  chore: delete acvm-release workflow
  chore: merge flake.nix files and remove inner workspace (#2826)
  chore(ci): remove stale job steps (#2816)
  chore(ci): ensure that the artifact rebuilding PR will run CI (#2824)
  feat(traits): Implement trait bounds typechecker + monomorphizer passes (#2717)
  ...
  • Loading branch information
TomAFrench committed Sep 26, 2023
2 parents 35699e3 + 63da875 commit 4a5f2db
Show file tree
Hide file tree
Showing 136 changed files with 1,821 additions and 9,581 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
33 changes: 5 additions & 28 deletions .github/workflows/abi_wasm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,46 +22,23 @@ jobs:
- name: Checkout sources
uses: actions/checkout@v3

- uses: cachix/install-nix-action@v20
- name: Setup Nix
uses: cachix/install-nix-action@v22
with:
nix_path: nixpkgs=channel:nixos-23.05
github_access_token: ${{ secrets.GITHUB_TOKEN }}

- name: Restore nix store cache
uses: actions/cache/restore@v3
id: cache
- uses: cachix/cachix-action@v12
with:
path: ${{ env.CACHED_PATH }}
key: ${{ runner.os }}-flake-abi-wasm-${{ hashFiles('*.lock') }}

# Based on https://github.com/marigold-dev/deku/blob/b5016f0cf4bf6ac48db9111b70dd7fb49b969dfd/.github/workflows/build.yml#L26
- name: Copy cache into nix store
if: steps.cache.outputs.cache-hit == 'true'
# We don't check the signature because we're the one that created the cache
run: |
for narinfo in ${{ env.CACHED_PATH }}/*.narinfo; do
path=$(head -n 1 "$narinfo" | awk '{print $2}')
nix copy --no-check-sigs --from "file://${{ env.CACHED_PATH }}" "$path"
done
name: barretenberg
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"

- name: Build noirc_abi_wasm
run: |
nix build -L .#noirc_abi_wasm
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
- uses: actions/cache/save@v3
# Don't create cache entries for the merge queue.
if: ${{ steps.cache.outputs.cache-hit != 'true' && github.event_name != 'merge_group' }}
with:
path: ${{ env.CACHED_PATH }}
key: ${{ steps.cache.outputs.cache-primary-key }}

- 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.

58 changes: 0 additions & 58 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 @@ -57,14 +55,9 @@ jobs:

- 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 @@ -83,38 +76,12 @@ jobs:

- 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
4 changes: 2 additions & 2 deletions .github/workflows/noir-js.yml
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 }}
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 }}
2 changes: 1 addition & 1 deletion .github/workflows/release-source-resolver.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Loading

0 comments on commit 4a5f2db

Please sign in to comment.