Skip to content

Commit

Permalink
chore: merge flake.nix files and remove inner workspace (noir-lang#2826)
Browse files Browse the repository at this point in the history
  • Loading branch information
kevaundray authored and Sakapoi committed Oct 19, 2023
1 parent b9bc60f commit 3063cdd
Show file tree
Hide file tree
Showing 22 changed files with 310 additions and 3,358 deletions.
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
37 changes: 0 additions & 37 deletions .github/workflows/acvm-rust.yml

This file was deleted.

27 changes: 2 additions & 25 deletions .github/workflows/acvm-test.yml
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 Down Expand Up @@ -96,25 +94,4 @@ jobs:
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/[email protected]
with:
targets: wasm32-unknown-unknown

- uses: taiki-e/install-action@v2
with:
tool: [email protected]

- name: Run rust tests
working-directory: acvm-repo
run: cargo test
yarn test:browser
5 changes: 3 additions & 2 deletions .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
".": "0.13.0"
}
".": "0.13.0",
"acvm-repo": "0.27.0"
}
Loading

0 comments on commit 3063cdd

Please sign in to comment.