Skip to content

fix: add barretenberg-rs and iOS/Android targets to Makefile#21204

Merged
johnathan79717 merged 1 commit intonextfrom
jh/ci-rust-ffi-test
Mar 6, 2026
Merged

fix: add barretenberg-rs and iOS/Android targets to Makefile#21204
johnathan79717 merged 1 commit intonextfrom
jh/ci-rust-ffi-test

Conversation

@johnathan79717
Copy link
Contributor

@johnathan79717 johnathan79717 commented Mar 6, 2026

Adds bb-rs and bb-rs-tests targets to the root Makefile so the Rust FFI crate is built and link-tested as part of fast and full CI (not only ci-barretenberg-full).

Also adds iOS and Android cross-compile targets (bb-cpp-cross-arm64-ios, bb-cpp-cross-arm64-ios-sim, bb-cpp-cross-arm64-android, bb-cpp-cross-x86_64-android) to the Makefile, wired into bb-cpp-cross so they get built during release. These were previously only built via the legacy build_with_makefile path in bootstrap.sh.

This would have caught the libc++/libstdc++ mismatch (fixed in #21203) that was introduced when the Zig preset became the default.

@johnathan79717 johnathan79717 added ci-barretenberg Run all barretenberg/cpp checks. ci-full Run all master checks. and removed ci-barretenberg Run all barretenberg/cpp checks. labels Mar 6, 2026
@johnathan79717 johnathan79717 changed the title ci: add barretenberg-rs build and test to fast CI ci: add barretenberg-rs and iOS/Android targets to Makefile Mar 6, 2026
@johnathan79717 johnathan79717 changed the title ci: add barretenberg-rs and iOS/Android targets to Makefile fix: add barretenberg-rs and iOS/Android targets to Makefile Mar 6, 2026
@johnathan79717 johnathan79717 added ci-release-pr Creates a development tag and runs the release suite and removed ci-full Run all master checks. labels Mar 6, 2026
@AztecBot AztecBot removed the ci-release-pr Creates a development tag and runs the release suite label Mar 6, 2026
@johnathan79717 johnathan79717 added the ci-release-pr Creates a development tag and runs the release suite label Mar 6, 2026
@johnathan79717 johnathan79717 changed the base branch from merge-train/barretenberg to next March 6, 2026 13:18
@AztecBot AztecBot removed the ci-release-pr Creates a development tag and runs the release suite label Mar 6, 2026
Add bb-rs and bb-rs-tests targets so the Rust FFI crate is built and
link-tested as part of fast and full CI.

Add iOS and Android cross-compile targets (bb-cpp-cross-arm64-ios,
bb-cpp-cross-arm64-ios-sim, bb-cpp-cross-arm64-android,
bb-cpp-cross-x86_64-android) wired into bb-cpp-cross for releases.
@johnathan79717 johnathan79717 added the ci-release-pr Creates a development tag and runs the release suite label Mar 6, 2026
@AztecBot AztecBot removed the ci-release-pr Creates a development tag and runs the release suite label Mar 6, 2026
@johnathan79717 johnathan79717 added this pull request to the merge queue Mar 6, 2026
Merged via the queue into next with commit d7f0ee6 Mar 6, 2026
29 of 33 checks passed
@johnathan79717 johnathan79717 deleted the jh/ci-rust-ffi-test branch March 6, 2026 18:17
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.

3 participants