Repository navigation
fix(core): Incorrect resource_dir when app run from new style target/PLATFORM+ARCH/(debug|release) dir - #8852
Merged
Merged
Conversation
amrbashir
requested changes
Feb 14, 2024
Comment on lines
-242
to
-243
| if curr_dir.ends_with(format!("{MAIN_SEPARATOR}target{MAIN_SEPARATOR}debug").as_str()) | ||
| || curr_dir.ends_with(format!("{MAIN_SEPARATOR}target{MAIN_SEPARATOR}release").as_str()) |
Member
There was a problem hiding this comment.
This check is broken anyways, it doesn't take into account that cargo supports arbitray profile names, cc @lucasfernog
Member
There was a problem hiding this comment.
yeah, pushed a change. I think checking if .cargo-lock exists should be enough
Co-authored-by: Amr Bashir <amr.bashir2015@gmail.com>
lucasfernog
previously approved these changes
Feb 18, 2024
amrbashir
approved these changes
Feb 18, 2024
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
V2 changed the target dir from
/target/(debug|release)totarget/PLATFORM+ARCH/(debug|release). When the app is run from the target dir,resource_dirfails to correctly resolve the resource directory on Mac (and maybe Linux) as the cwd doesn't match the check for the/target/(debug|release).This changes the check to support both
/target/(debug|release)andtarget/PLATFORM+ARCH/(debug|release)