Store artifact deps in build unit dir #16519
Merged
+203
−7
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-layout
weihanglo
reviewed
Jan 16, 2026
| } | ||
|
|
||
| #[cargo_test] | ||
| fn artifact_deps() { |
Member
There was a problem hiding this comment.
Do we want to also check those environment variables are pointing to the corret directory layout?
(the directory and bin path one maybe?)
Member
Author
There was a problem hiding this comment.
ahh good call out, yeah let me include those in the test
ranger-ross
force-pushed
the
artifact-deps
branch
2 times, most recently
from
b1b2aa0 to
5bf02be
Compare
weihanglo
approved these changes
Jan 16, 2026
auto-merge was automatically disabled
January 16, 2026 14:53
Head branch was pushed to by a user without write access
ranger-ross
force-pushed
the
artifact-deps
branch
2 times, most recently
from
fdc2b9b to
98bab12
Compare
Member
Author
|
okay, I think I fixed the test failures in CI. but now there is an unrelated failure would you mind re-running the CI jobs? |
Member
|
Still failed |
ranger-ross
force-pushed
the
artifact-deps
branch
from
98bab12 to
67aaf3b
Compare
Member
Author
|
Okay CI is passing now (sorry about that, windows MSVC file paths always get me) |
rustbot
removed
the
S-waiting-on-review
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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 spawned out of #16502 (comment) when I noticed artifact dependencies are not using the new build-dir layout.
This PR moves them from
<build-dir>/<profile>/deps/artifact/$pkgname-$META(old layout) to<build-dir>/<profile>/build/$pkgname/$META/deps/artifact/<kind>when-Zbuild-dir-new-layoutis enabled.cc tracking issue: #15010
How to test and review this PR?
Added new test specifically for artifact deps
r? @epage