Skip to content
This repository has been archived by the owner on Apr 9, 2024. It is now read-only.

chore: Bring acvm_js package into the workspace #459

Merged
merged 102 commits into from
Aug 8, 2023

Conversation

kobyhallx
Copy link
Contributor

Description

Problem*

Dev workflow is less efficient with acvm_js being in separate repository as per #458

Resolves #458

Summary*

Pulls in noir-lang/acvm-simulator into acvm_js directory.

Additional Context

PR Checklist*

  • I have tested the changes locally.
  • I have formatted the changes with Prettier and/or cargo fmt on default settings.

TomAFrench and others added 30 commits May 8, 2023 07:53
chore: implement `From` between JS and Rust witness maps
chore: fill out optional fields of `Cargo.toml`
…simulator#31)

Co-authored-by: Globallager <72797635+Globallager@users.noreply.github.com>
@kobyhallx kobyhallx force-pushed the combined_history-acvm_js branch 2 times, most recently from 783d410 to 451933f Compare August 2, 2023 10:17
@kobyhallx kobyhallx marked this pull request as ready for review August 2, 2023 11:38
.github/workflows/release.yml Show resolved Hide resolved
Cargo.toml Show resolved Hide resolved
acvm_js/README.md Show resolved Hide resolved
release-please-config.json Show resolved Hide resolved
acvm_js/.gitattributes Outdated Show resolved Hide resolved
@TomAFrench TomAFrench changed the title chore: Combined history acvm js chore: Bring acvm_js package into the workspace Aug 3, 2023
Copy link
Member

@TomAFrench TomAFrench left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Running ./build.sh doesn't result in a build output in the right place for running tests on acvm_js however I think the fact we have CI working is fine. We can improve the build scripts later.

@TomAFrench
Copy link
Member

@kevaundray can you force this through?

@kevaundray kevaundray added this pull request to the merge queue Aug 8, 2023
Merged via the queue into master with commit 85b9adc Aug 8, 2023
12 checks passed
@TomAFrench TomAFrench deleted the combined_history-acvm_js branch August 8, 2023 10:47
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

chore: pull acvm_js into acvm
6 participants