Skip to content

refactor: use Make targets for ci-barretenberg CI paths#22061

Merged
johnathan79717 merged 1 commit into
merge-train/barretenbergfrom
jh/ci-barretenberg-use-make
Mar 26, 2026
Merged

refactor: use Make targets for ci-barretenberg CI paths#22061
johnathan79717 merged 1 commit into
merge-train/barretenbergfrom
jh/ci-barretenberg-use-make

Conversation

@johnathan79717

Copy link
Copy Markdown
Contributor

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

…cy resolution

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

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).

Also adds bb-crs as an explicit dependency of bb-cpp-native-tests.

@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.

lgtm

@ludamad

ludamad commented Mar 26, 2026

Copy link
Copy Markdown
Collaborator

are we now downloading the CRS in CI each time? no right?

@ludamad

ludamad commented Mar 26, 2026

Copy link
Copy Markdown
Collaborator

we want to use the existing mount

@johnathan79717 johnathan79717 merged commit 3b53c04 into merge-train/barretenberg Mar 26, 2026
11 checks passed
@johnathan79717 johnathan79717 deleted the jh/ci-barretenberg-use-make branch March 26, 2026 14:38
@johnathan79717

Copy link
Copy Markdown
Contributor Author

I may need to update the AMI to make sure it's already in the mount.

github-merge-queue Bot pushed a commit that referenced this pull request Mar 26, 2026
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
AztecBot added a commit that referenced this pull request Apr 3, 2026
PR #22061 switched ci-barretenberg from calling bootstrap.sh ci
(which builds AND runs tests) to make targets that only collect
test commands into /tmp/test_cmds without starting the test engine
to execute them. This meant BB tests silently stopped running on
merge-train/barretenberg PRs.

Revert to calling bootstrap.sh ci directly. For ci-barretenberg,
add explicit CRS download (the original motivation for #22061).
For ci-barretenberg-full, barretenberg/bootstrap.sh already handles
CRS download in bootstrap_all.
ludamad pushed a commit that referenced this pull request Apr 3, 2026
## Summary

PR #22061 switched `ci-barretenberg` and `ci-barretenberg-full` from
calling `bootstrap.sh ci` (which builds AND runs tests via
`parallelize`) to Make targets that only collect test commands into
`/tmp/test_cmds` without ever starting the test engine to execute them.
This meant BB tests silently stopped running on all
`merge-train/barretenberg` PRs.

**Fix**: Revert to calling `bootstrap.sh ci` directly.
- `ci-barretenberg`: Add explicit CRS download before
`barretenberg/cpp/bootstrap.sh ci` (preserving the CRS fix that #22061
was trying to solve)
- `ci-barretenberg-full`: Revert to `barretenberg/bootstrap.sh ci`
(which already downloads CRS via `bootstrap_all`)

## Test plan

- [ ] `ci-barretenberg` label triggers build + test execution (not just
build)
- [ ] `ci-barretenberg-full` label triggers full build + test execution
- [ ] CRS tests pass (the original motivation for #22061)

ClaudeBox log: https://claudebox.work/s/0b1cdb0a4d7a7f5a?run=2
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.

2 participants