Skip to content
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
7 changes: 5 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,10 @@ avm-transpiler-cross-amd64-macos:
avm-transpiler-cross-arm64-macos:
$(call build,$@,avm-transpiler,build_cross arm64-macos)

avm-transpiler-cross: avm-transpiler-cross-amd64-macos avm-transpiler-cross-arm64-macos
avm-transpiler-cross-arm64-linux:
$(call build,$@,avm-transpiler,build_cross arm64-linux)

avm-transpiler-cross: avm-transpiler-cross-amd64-macos avm-transpiler-cross-arm64-macos avm-transpiler-cross-arm64-linux

#==============================================================================
# Barretenberg
Expand Down Expand Up @@ -134,7 +137,7 @@ bb-cpp-cross-arm64-macos-objects:
$(call build,$@,barretenberg/cpp,build_cross_objects arm64-macos)

# Cross-compile for ARM64 Linux (release only)
bb-cpp-cross-arm64-linux: bb-cpp-cross-arm64-linux-objects avm-transpiler-native
bb-cpp-cross-arm64-linux: bb-cpp-cross-arm64-linux-objects avm-transpiler-cross-arm64-linux
$(call build,$@,barretenberg/cpp,build_cross arm64-linux)

# Cross-compile for AMD64 macOS (release only)
Expand Down
6 changes: 3 additions & 3 deletions barretenberg/rust/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ function release {
# Set the workspace version to match the release tag
sed -i "s/^version = \".*\"/version = \"$version\"/" Cargo.toml

# Generated files must exist (created during build step)
# Generated files must exist (created during build step, or generate now)
if [ ! -f barretenberg-rs/src/api.rs ] || [ ! -f barretenberg-rs/src/generated_types.rs ]; then
echo "ERROR: generated files not found. Run 'cd ../ts && yarn generate' first."
exit 1
echo "Generated files not found, running yarn generate..."
(cd ../ts && yarn generate)
fi

# Publish to crates.io (--allow-dirty because version was just set and generated files are gitignored)
Expand Down
3 changes: 2 additions & 1 deletion barretenberg/ts/scripts/copy_cross.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,6 @@ elif semver check "${REF_NAME:-}" && [[ "$(arch)" == "amd64" ]]; then
llvm-strip-20 ./build/*/*
else
echo "This task is expected to be run in an x86 release context."
exit 1
# TODO bring back. was being called by release.
# exit 1
fi
Loading