Support packaging cairo-plugins #1605
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
- Allow package with `[cairo-plugin]` target to be packaged - Run `cargo package` to build + normalize `Cargo.toml` - Add normalized and original `Cargo.toml` to the package archive - Add `get_cargo_package_name` helper to read package name from `Cargo.toml` - TODO: consider sharing duplicated logic in `check_corelib_version`
Don't use version as used in Scarb.toml, use the one in Cargo.toml instead to ensure path can be resolved
This reverts commit 7d8001c.
- Pass `--offline` for all cmds - Pass `--no-metadata`, `--verify`, `--allow-dirty` for `package`
Instead of just Cargo manifest package name
Let cargo worry about specifics of manifest path
maciektr
reviewed
Oct 10, 2024
maciektr
reviewed
Oct 10, 2024
Signed-off-by: Maksim Zdobnikau <43750648+DelevoXDG@users.noreply.github.com>
….com/software-mansion/scarb into zdobnikau/1527-package-cairo-plugins
5 tasks
maciektr
approved these changes
Oct 14, 2024
Signed-off-by: maciektr <mtratnowiecki@gmail.com>
github-merge-queue bot
pushed a commit
that referenced
this pull request
Oct 16, 2024
Resolves the issue brought up in #1605 (comment)
maciektr
added a commit
that referenced
this pull request
Nov 18, 2024
## Changes - Allow packaging cairo-plugins - Run `cargo package` to normalize `Cargo.toml` and verify rust code for proc macros - Skip `cargo package` and verification for builtin plugins - Pass relevant configuration options from `scarb package` to `cargo package` - Update manifest normalization to include normalized `[cairo-plugin]` section - Fix `shared_lib_path` resolution to support packages mismatched scarb / cargo name and version ## Related issues Closes #1527 --------- Signed-off-by: Maksim Zdobnikau <43750648+DelevoXDG@users.noreply.github.com> Signed-off-by: maciektr <mtratnowiecki@gmail.com> Co-authored-by: maciektr <maciej.tratnowiecki@swmansion.com>
maciektr
pushed a commit
that referenced
this pull request
Nov 18, 2024
Resolves the issue brought up in #1605 (comment)
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.
Changes
cargo packageto normalizeCargo.tomland verify rust code for proc macroscargo packageand verification for builtin pluginsscarb packagetocargo package[cairo-plugin]sectionshared_lib_pathresolution to support packages mismatched scarb / cargo name and versionRelated issues
Closes #1527