Use subtree again to allow publishing the crate #34
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
git-subtree-dir: depend/zcash git-subtree-split: 9af3bce265ba428382006b0940678418d65f505f
conradoplg
requested review from
a team and
teor2345
and removed request for
a team
dconnolly
approved these changes
May 17, 2022
|
OK, GitHub won't allow us to rebase-and-merge because |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
cargo packageis not currently working becausecargo packageignores subfolders withCargo.tomlin them. We can't work around that with submodules since they don't allow making local changes (and I couldn't get it to work in conjunction withsparse-checkout).This reverts to using
subtree(which in practice makes this PR include the entirezcashtree, so it looks much bigger than it is).We were using
subtree(exactly to solve this issue) but we had reverted tosubmodulebecausesubtreebehaves strangely if you use squash-and-merge. For this reason, please do not squash-and-merge this PR (though if that ends up happening it's easy to fix, and it's now documented in the README).I also did not use
cargo releasefor this PR because I only noticed later that we were supposed to use it. So I manually made the changes. I'm not sure if we want to keep using it from now on.