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

sdk: Move out things that won't be in the sdk #4624

Merged
merged 6 commits into from
Jan 27, 2025

Conversation

joncinque
Copy link

@joncinque joncinque commented Jan 24, 2025

Problem

The Solana sdk will soon have a standalone repository, but the sdk/
directory in the agave repo contains some things that won't move over.

Summary of changes

Move the following and update paths:

  • cargo-build-sbf
  • cargo-test-sbf
  • sdk/sbf
  • gen-headers
  • docker-solana

NOTE: Leaving in draft to see how CI goes CI passed!

#### Problem

The Solana sdk will soon have a standalone repository, but the `sdk/`
directory in the agave repo contains some things that won't move over.

#### Summary of changes

Move the following and update paths:

* cargo-build-sbf
* cargo-test-sbf
* sdk/sbf
* gen-headers
Comment on lines +222 to +223
mkdir -p "$installDir"/bin/platform-tools-sdk/sbf
cp -a platform-tools-sdk/sbf/* "$installDir"/bin/platform-tools-sdk/sbf
Copy link
Author

Choose a reason for hiding this comment

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

This is the change I'm least sure about, I'm not sure if it will break any existing tooling to put the sbf sdk in a new directory during installation

Copy link
Member

Choose a reason for hiding this comment

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

will we use the sdk dir name for storing sdk related items in the future? If not, I think we can keep this one. if I don't miss anything, this will be located in the end user’s system, so the name might not need to reflect our source 🤔 (line 223)

btw, if we decide to keep the original struct, we may need to update the logic in cargo-build-sbf and cargo-test-sbf

Copy link
Author

Choose a reason for hiding this comment

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

I thought it would be more confusing to use a different directory between the monorepo and the release. My hope is that there's no sdk/ in agave in the future, and that we can even move platform-tool-sdk out too!

I'll keep this then, thanks!

@joncinque joncinque requested a review from yihau January 24, 2025 23:09
@joncinque joncinque marked this pull request as ready for review January 24, 2025 23:09
@joncinque joncinque requested a review from a team as a code owner January 24, 2025 23:09
Copy link
Member

@yihau yihau left a comment

Choose a reason for hiding this comment

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

🪖

Comment on lines +222 to +223
mkdir -p "$installDir"/bin/platform-tools-sdk/sbf
cp -a platform-tools-sdk/sbf/* "$installDir"/bin/platform-tools-sdk/sbf
Copy link
Member

Choose a reason for hiding this comment

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

will we use the sdk dir name for storing sdk related items in the future? If not, I think we can keep this one. if I don't miss anything, this will be located in the end user’s system, so the name might not need to reflect our source 🤔 (line 223)

btw, if we decide to keep the original struct, we may need to update the logic in cargo-build-sbf and cargo-test-sbf

Copy link

@pgarg66 pgarg66 left a comment

Choose a reason for hiding this comment

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

Approving for SVM

@joncinque joncinque merged commit f9f73a9 into anza-xyz:master Jan 27, 2025
60 checks passed
@joncinque joncinque deleted the move-sbf branch January 27, 2025 14:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants