Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update bash script shebangs and dockerfiles #3875

Merged
merged 10 commits into from
Dec 19, 2023
Merged

Conversation

AztecBot
Copy link
Collaborator

Development from Aztec.

ludamad and others added 9 commits November 28, 2023 00:36
This is a dual-list commit in both Noir and aztec repo. In this PR,
Aztec gets the code to make a mirror, and the mirror action pushes to
our `aztec` branch in Noir. The `aztec` branch features this as the
first commit, to then be pushed one by one from master as Noir changes
come in.

---------

Co-authored-by: ludamad <adam@aztecprotocol.com>
This PR updates aztec-packages to use latest noir.

- Regarding noir_wasm, providing the solved sources directly to
`node_wasm` eliminates the need for `source-resolver`, which has been
completely removed from the repository.
 - Added required pub in return values
 - Updated return_type
 - Pulled latest noir
.github/workflows/test-cargo.yml Outdated Show resolved Hide resolved
tooling/nargo_cli/src/cli/lsp_cmd.rs Outdated Show resolved Hide resolved
@TomAFrench TomAFrench changed the title feat: aztec-packages chore: update bash script shebangs Dec 19, 2023
@TomAFrench TomAFrench changed the title chore: update bash script shebangs chore: update bash script shebangs and dockerfiles Dec 19, 2023
@TomAFrench TomAFrench added this pull request to the merge queue Dec 19, 2023
@@ -14,7 +14,7 @@ process_dir() {
if [ -d ./target/ ]; then
rm -r ./target/
fi
cargo run compile --only-acir && cargo run execute witness
nargo compile --only-acir && nargo execute witness
Copy link
Contributor

Choose a reason for hiding this comment

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

Hmmm. I made this change, but not sure if this is safe to bring back to noir. 🤔

Merged via the queue into master with commit c2c3388 Dec 19, 2023
31 checks passed
@TomAFrench TomAFrench deleted the aztec-packages branch December 19, 2023 14:16
github-merge-queue bot pushed a commit that referenced this pull request Dec 19, 2023
# Description

## Problem\*

Resolves <!-- Link to GitHub Issue -->

## Summary\*

This PR re-adds a change which was removed from #3875 which is required
for the LSP to run inside of a docker container.

## Additional Context



## Documentation\*

Check one:
- [x] No documentation needed.
- [ ] Documentation included in this PR.
- [ ] **[Exceptional Case]** Documentation to be submitted in a separate
PR.

# PR Checklist\*

- [x] I have tested the changes locally.
- [x] I have formatted the changes with [Prettier](https://prettier.io/)
and/or `cargo fmt` on default settings.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants