Skip to content

feat: merge-train/barretenberg#22041

Merged
AztecBot merged 3 commits into
nextfrom
merge-train/barretenberg
Mar 26, 2026
Merged

feat: merge-train/barretenberg#22041
AztecBot merged 3 commits into
nextfrom
merge-train/barretenberg

Conversation

@AztecBot

@AztecBot AztecBot commented Mar 26, 2026

Copy link
Copy Markdown
Collaborator

BEGIN_COMMIT_OVERRIDE
chore: error in honk rec constraint creation for bad proof size (#21974)
chore: merge next into merge-train/barretenberg (#22049)
refactor: use Make targets for ci-barretenberg CI paths (#22061)
END_COMMIT_OVERRIDE

In the case that the proof size is mis-specified in a noir program
performing honk recursion, this will provide a meaningful error.

@ludamad ludamad left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

🤖 Auto-approved

@AztecBot AztecBot enabled auto-merge March 26, 2026 13:30
@AztecBot

Copy link
Copy Markdown
Collaborator Author

🤖 Auto-merge enabled after 4 hours of inactivity. This PR will be merged automatically once all checks pass.

## Summary
- Merge `next` into `merge-train/barretenberg` to catch up on ~25+
commits
- The automated merge-next workflow has been failing silently due to a
GitHub ruleset requiring PRs for `merge-train/*` branches (GH013 error)

---------

Co-authored-by: spypsy <spypsy@outlook.com>
Co-authored-by: spypsy <spypsy@users.noreply.github.com>
Co-authored-by: Michal Rzeszutko <michal.rzeszutko@gmail.com>
Co-authored-by: Martin Verzilli <martin@aztec-labs.com>
Co-authored-by: Nicolas Chamo <nicolas@chamo.com.ar>
Co-authored-by: Aztec Bot <49558828+AztecBot@users.noreply.github.com>
Co-authored-by: Nicolás Venturo <nicolas.venturo@gmail.com>
Co-authored-by: Gregorio Juliana <gregojquiros@gmail.com>
Co-authored-by: Jan Beneš <janbenes1234@gmail.com>
Co-authored-by: Esau <esau@aztec-labs.com>
Co-authored-by: PhilWindle <60546371+PhilWindle@users.noreply.github.com>
Co-authored-by: esau <152162806+sklppy88@users.noreply.github.com>
Co-authored-by: Alex Gherghisan <alexghr@users.noreply.github.com>
Co-authored-by: Josh Crites <jc@joshcrites.com>
Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Co-authored-by: ludamad <adam.domurad@gmail.com>
Co-authored-by: Phil Windle <philip.windle@gmail.com>
Co-authored-by: critesjosh <18372439+critesjosh@users.noreply.github.com>
Co-authored-by: David Banks <47112877+dbanks12@users.noreply.github.com>
Co-authored-by: AztecBot <tech@aztec-labs.com>
Co-authored-by: jfecher <13188781+jfecher@users.noreply.github.com>
Co-authored-by: benesjan <benesjan@users.noreply.github.com>
Co-authored-by: Maxim Vezenov <mvezenov@gmail.com>
Co-authored-by: johnathan79717 <511655+johnathan79717@users.noreply.github.com>
Co-authored-by: Ilyas Ridhuan <ilyas@aztecprotocol.com>
## Summary

- `ci-barretenberg` now uses `make bb-cpp-native-tests` instead of
calling `barretenberg/cpp/bootstrap.sh ci` directly
- `ci-barretenberg-full` now uses `make bb-tests bb-full-tests` instead
of `barretenberg/bootstrap.sh ci`
- Adds `bb-crs` as a dependency of `bb-cpp-native-tests`

This ensures dependencies like `bb-crs` are resolved automatically by
Make, fixing test failures when `bn254_g1_compressed.dat` is missing
from the CRS cache (e.g. `CrsFactory.Bn254CompressedChunkHash` tests).
Previously, `ci-barretenberg` called `barretenberg/cpp/bootstrap.sh ci`
directly, which never ran the CRS download step.

The underlying build and test functions are unchanged; only the
orchestration layer switches from direct bootstrap.sh calls to Make
targets.

## Test plan

- [ ] `ci-barretenberg` label triggers the same build+test flow via Make
- [ ] `ci-barretenberg-full` label triggers the same full build+test
flow via Make
- [ ] CRS tests (CrsFactory.Bn254CompressedChunkHash*) pass even without
pre-baked CRS in the AMI
@AztecBot AztecBot added this pull request to the merge queue Mar 26, 2026
Merged via the queue into next with commit fa49d9f Mar 26, 2026
19 of 23 checks passed
@AztecBot AztecBot deleted the merge-train/barretenberg branch March 26, 2026 15:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants