Fix martin-ui crate packaging #1668
Merged
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
The martin-ui dir must be part of the martin package, otherwise it does not get included in the `cargo publish -p martin`. We could also do it with a symlink from inside the `/martin` dir, but that gets a bit confusing - easier to just keep ui inside martin itself, as it is not used anywhere outside of that crate.
|
cc: @paigewilliams - do you know how to best solve the TODO? |
|
@nyurik I could tap in here if this is still pending a solve. |
|
@Auspicus that would be awesome, thanks! |
nyurik
commented
Feb 23, 2025
|
Nope, still broken - #1699 is the CI test |
|
Sorry, should have commented something to that regard. e4f99ad was only meant as a step into the right direction... |
nyurik
added a commit
that referenced
this pull request
Mar 4, 2025
Run `npm install` and javascript packaging inside the `OUT_DIR`
```
error: failed to verify package tarball
Caused by:
Source directory was modified by build.rs during cargo publish. Build scripts should not modify anything outside of OUT_DIR.
Added: .../martin/target/package/martin-0.15.0/martin-ui/dist
.../martin/target/package/martin-0.15.0/martin-ui/dist/_
.../martin/target/package/martin-0.15.0/martin-ui/dist/_/assets
...
```
Fixes #1667
See prior partial fix in #1668
---------
Co-authored-by: Frank Elsinga <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Frank Elsinga <[email protected]>
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.
STATUS: this PR can use some help from other folks - it deals with NPM integration, which turns out is not working as intended... :(
The martin-ui dir must be part of the martin package, otherwise it does not get included in the
cargo publish -p martin. We could also do it with a symlink from inside the/martindir, but that gets a bit confusing - easier to just keep ui inside martin itself, as it is not used anywhere outside of that crate.In order to prevent these bugs in the future, we might want to run
cargo +nightly publish --workspace -Z package-workspace --dry-runas part of some CI -- this will take into account that some crates depend on the other, and that some/all of them have not been published yetTODO
martin/build.rsto install node files inside the standard build dir. Current dry run shows this error:I am not sure we should use
--no-verifyfixes #1667