fix(script): Tweak cargo script build-dir / target-dir #16086
+63
−52
Conversation
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
rustbot
added
A-workspaces
|
r? @weihanglo rustbot has assigned @weihanglo. Use |
Kind of confusing to have them defined in terms of each other but - When we move the defualt `build-dir`, I expect we'll just delete the conditional and make the cargo script default `build-dir` the only default `build-dir` - I plan to change the cargo script default `target-dir`
This avoids needing to be careful about cargo scripts conflicting with "artifact names". Granted, there will be more work to deal with the validation checks but that comes later.
epage
changed the title
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.
What does this PR try to resolve?
This is meant to unblock efforts for allowing cargo scripts to use artifact names like
depswithout being sanitized or erroring. This is done by making the defaulttarget-direxclude allbuild-dircontent by putting the default cargo scripttarget-dirunderbuild-dir.Cargo script target-dir precedence
target-dirtarget-dir"{cargo-cache-home}/target/{workspace-path-hash}""{build-dir}/target"Cargo script build-dir precedence
build-dirbuild-dirtarget-dirtarget-dir"{cargo-cache-home}/target/{workspace-path-hash}""{cargo-cache-home}/target/{workspace-path-hash}"In doing this split, it highlighted the fact that we still had
Cargo.lockfor cargo scripts intarget-dirdespite being an intermediate build artifact, so this also moves that intobuild-dir. This does mean that if someone has a sharedbuild-dirbetween their projects, their scripts will get a bit confusing. I plan to highlight that in the tracking issue / stabilization report.How to test and review this PR?
Notes
Work left to do for artifact names
examples/when its not usedtarget_dir == build_dir