Skip to content
This repository was archived by the owner on Mar 27, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
with:
repository: AztecProtocol/barretenberg
path: barretenberg
ref: d104756225a72c047a6b54d453cea2d3fb0110bb
ref: ecb61292c96c3b1fc673bcd96920cd2f00fe28b9

- name: Setup Linux environment
if: matrix.os == 'ubuntu-latest'
Expand Down Expand Up @@ -87,4 +87,4 @@ jobs:

- name: Run cargo test
run: |
cargo test --locked -- --test-threads=1
cargo test --locked
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ to install everything globally, you'll need:

Linker provided by Clang, but might need to be installed via `apt install lld`.

4. `barretenberg` (preferably at commit `d104756225a72c047a6b54d453cea2d3fb0110bb`)
4. `barretenberg` (preferably at commit `ecb61292c96c3b1fc673bcd96920cd2f00fe28b9`)

Needs to be built and installed following the instructions [in the README](https://github.com/AztecProtocol/barretenberg#getting-started). Note that barretenberg has its own [dependencies](https://github.com/AztecProtocol/barretenberg#dependencies) that will need to be installed, such as `cmake` and `ninja`.

Expand Down
6 changes: 3 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 0 additions & 7 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,6 @@
environment = {
# rust-bindgen needs to know the location of libclang
LIBCLANG_PATH = "${pkgs.llvmPackages.libclang.lib}/lib";

# Barretenberg fails if tests are run on multiple threads, so we set the test thread
# count to 1 throughout the entire project
#
# Note: Setting this allows for consistent behavior across build and shells, but is mostly
# hidden from the developer - i.e. when they see the command being run via `nix flake check`
RUST_TEST_THREADS = "1";
};

# As per https://discourse.nixos.org/t/gcc11stdenv-and-clang/17734/7 since it seems that aarch64-linux uses
Expand Down