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

remove ntapi patch #3584

Merged
merged 3 commits into from
Nov 15, 2024
Merged

remove ntapi patch #3584

merged 3 commits into from
Nov 15, 2024

Conversation

yihau
Copy link
Member

@yihau yihau commented Nov 12, 2024

Problem

we should use anza-xyz/ntapi as the vendor. just forked it and the commit, https://github.com/anza-xyz/ntapi/commits/97ede981a1777883ff86d142b75024b023f04fad, is reachable

remove outdated patch

@yihau yihau added v2.0 Backport to v2.0 branch v2.1 Backport to v2.1 branch labels Nov 12, 2024
@yihau yihau requested a review from ryoqun November 12, 2024 05:02
Copy link

mergify bot commented Nov 12, 2024

Backports to the stable branch are to be avoided unless absolutely necessary for fixing bugs, security issues, and perf regressions. Changes intended for backport should be structured such that a minimum effective diff can be committed separately from any refactoring, plumbing, cleanup, etc that are not strictly necessary to achieve the goal. Any of the latter should go only into master and ride the normal stabilization schedule.

Copy link

mergify bot commented Nov 12, 2024

Backports to the beta branch are to be avoided unless absolutely necessary for fixing bugs, security issues, and perf regressions. Changes intended for backport should be structured such that a minimum effective diff can be committed separately from any refactoring, plumbing, cleanup, etc that are not strictly necessary to achieve the goal. Any of the latter should go only into master and ride the normal stabilization schedule. Exceptions include CI/metrics changes, CLI improvements and documentation updates on a case by case basis.

@yihau
Copy link
Member Author

yihau commented Nov 12, 2024

found solana-labs#32488 and solana-labs#32491.
also ntapi has released new version 0.4.0 and 0.4.1. both of them include the commit that we need MSxDOS/ntapi@24fc1e4

do we still need to patch this one 🤔

@yihau yihau changed the title use anza-xyz/ntapi instead of the labs one remove ntapi patch Nov 13, 2024
@ryoqun
Copy link
Member

ryoqun commented Nov 13, 2024

do we still need to patch this one 🤔

as you guessed, this entirely should rather be removed. it's no longer used as indicated here:

image

--config 'patch.crates-io.ntapi.git="https://github.com/solana-labs/ntapi"' \
--config 'patch.crates-io.ntapi.rev="97ede981a1777883ff86d142b75024b023f04fad"' \
install --locked spl-token-cli --root "$installDir" $maybeSplTokenCliVersionArg
"$cargo" $maybeRustVersion install --locked spl-token-cli --root "$installDir" $maybeSplTokenCliVersionArg
Copy link
Member

Choose a reason for hiding this comment

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

nit: seems the needed shellcheck disable=... is missing...

Copy link
Member Author

Choose a reason for hiding this comment

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

yeah... fixed 6bb361c

Copy link
Member

@ryoqun ryoqun left a comment

Choose a reason for hiding this comment

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

lgtm; thanks for cleaning up!

@yihau yihau merged commit da90cbe into anza-xyz:master Nov 15, 2024
20 checks passed
@yihau yihau deleted the use-anza-ntapi branch November 15, 2024 16:30
mergify bot pushed a commit that referenced this pull request Nov 15, 2024
* use anza-xyz/ntapi instead of the labs one

* remove ntapi patch

* fix shellcheck

(cherry picked from commit da90cbe)
mergify bot pushed a commit that referenced this pull request Nov 15, 2024
* use anza-xyz/ntapi instead of the labs one

* remove ntapi patch

* fix shellcheck

(cherry picked from commit da90cbe)
yihau added a commit that referenced this pull request Nov 21, 2024
remove ntapi patch (#3584)

* use anza-xyz/ntapi instead of the labs one

* remove ntapi patch

* fix shellcheck

(cherry picked from commit da90cbe)

Co-authored-by: Yihau Chen <yihau.chen@icloud.com>
yihau added a commit that referenced this pull request Nov 21, 2024
remove ntapi patch (#3584)

* use anza-xyz/ntapi instead of the labs one

* remove ntapi patch

* fix shellcheck

(cherry picked from commit da90cbe)

Co-authored-by: Yihau Chen <yihau.chen@icloud.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
v2.0 Backport to v2.0 branch v2.1 Backport to v2.1 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants