Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build mono with buck2 #881

Merged
merged 16 commits into from
Mar 6, 2025
Merged

Conversation

MrBeanCpp
Copy link
Contributor

#868

  • There's still 1 error for mono build: can't find crate for vault
  • Successfully build jupiter callisto common saturn ceres mercury taurus with buck2

# Conflicts:
#	jupiter/src/storage/init.rs
#	mono/src/build.rs
Copy link

vercel bot commented Mar 6, 2025

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
mega ✅ Ready (Inspect) Visit Preview 💬 Add feedback Mar 6, 2025 10:18am

Choose a reason for hiding this comment

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

PR Overview

This PR aims to improve the build and dependency configuration for building mono with buck2 while also streamlining LFS API calls and configuration file paths. Key changes include:

  • Updates to third-party/Cargo.toml with new dependencies and feature flags.
  • Adjustments in mono/Cargo.toml and mono/src/main.rs to remove shadow_rs build-time metadata.
  • Modifications to file paths in include_str! macros and LFS API call signatures for consistency.

Reviewed Changes

File Description
third-party/Cargo.toml Added new dependencies and feature flags to support buck2 build.
mono/Cargo.toml Removed shadow-rs build dependency and commented out related entries.
third-party/README.md Added attention note for fixups.toml handling.
common/config.toml Introduced a new config file redirecting to mega/config.toml.
mono/src/main.rs Removed shadow_rs code, reflecting build metadata removal.
jupiter/src/storage/init.rs Updated SQL file include path for sqlite initialization.
common/src/config.rs Changed include_str! path to reference the new config file location.
mono/src/api/lfs/lfs_router.rs Updated lfs_download_object call to pass an owned String.
ceres/src/lfs/handler.rs Modified lfs_download_object signature for consistency.
mono/src/build.rs Removed build script file and associated shadow_rs usage.

Copilot reviewed 99 out of 99 changed files in this pull request and generated no comments.

Comments suppressed due to low confidence (2)

common/src/config.rs:69

  • Ensure that the updated relative path in the include_str! macro correctly resolves to the intended configuration file following the directory restructuring.
let default_config = include_str!("../config.toml");

ceres/src/lfs/handler.rs:366

  • [nitpick] Consider whether the re-borrowing of 'oid' is necessary; if not needed for lifetime or borrowing reasons, you might simplify the code by using the parameter directly.
let oid = &oid;
@genedna genedna added this pull request to the merge queue Mar 6, 2025
Merged via the queue into web3infra-foundation:main with commit 0fc6fca Mar 6, 2025
16 of 20 checks passed
@MrBeanCpp MrBeanCpp deleted the buck-mono branch March 6, 2025 11:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants