Support manifest path override #32
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
GeorgeHahn
commented
Oct 18, 2022
taiki-e
reviewed
Oct 19, 2022
There was a problem hiding this comment.
Thanks! Could you update the inputs options table in readme?
main.sh
Outdated
| manifest_path="${INPUT_MANIFEST_PATH:-}" | ||
| if [[ -n "${manifest_path}" ]]; then | ||
| build_options+=("--manifest-path" "${manifest_path}") | ||
| build_options+=("--target-dir" "${RUNNER_TEMP}/target") |
There was a problem hiding this comment.
It is probably preferable to use cargo metadata to get the default target directory, rather than setting our own target directory.
Something like the following:
if [[ -n "${manifest_path}" ]]; then
build_options+=("--manifest-path" "${manifest_path}")
target_dir=$(cargo metadata --format-version=1 --no-deps --manifest-path "${manifest_path}" | jq -r '."target_directory"')
else
target_dir=$(cargo metadata --format-version=1 --no-deps | jq -r '."target_directory"')
fi
if [[ -n "${INPUT_TARGET:-}" ]]; then
build_options+=("--target" "${target}")
target_dir="${target_dir}/${target}/release"
else
target_dir="${target_dir}/release"
fi
|
Sorry for the delay! I made the changes you asked for but have not tested it out yet. I can drop a comment here once I've tried a release. |
|
I tested this out and it's working nicely. Thanks for the review & the cargo metadata help! |
|
Published in 1.10.0. |
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.
This adds support for building crates that aren't in the repository's root directory.
Closes #31