Skip to content

Conversation

@ranger-ross
Copy link
Member

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-layout is enabled.

cc tracking issue: #15010

How to test and review this PR?

Added new test specifically for artifact deps

r? @epage

@rustbot rustbot added A-layout Area: target output directory layout, naming, and organization S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 16, 2026
}

#[cargo_test]
fn artifact_deps() {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want to also check those environment variables are pointing to the corret directory layout?

(the directory and bin path one maybe?)

https://doc.rust-lang.org/beta/cargo/reference/unstable.html#artifact-dependencies-environment-variables

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ahh good call out, yeah let me include those in the test

@ranger-ross ranger-ross force-pushed the artifact-deps branch 2 times, most recently from b1b2aa0 to 5bf02be Compare January 16, 2026 14:35
Copy link
Member

@weihanglo weihanglo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@weihanglo weihanglo enabled auto-merge January 16, 2026 14:49
auto-merge was automatically disabled January 16, 2026 14:53

Head branch was pushed to by a user without write access

@ranger-ross
Copy link
Member Author

okay, I think I fixed the test failures in CI. but now there is an unrelated failure

#3 ERROR: failed to authorize: failed to fetch oauth token: unexpected status from POST request to https://auth.docker.io/token: 504 Gateway Timeout: <html><body><h1>504 Gateway Time-out</h1>
The server didn't respond in time.

would you mind re-running the CI jobs?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-layout Area: target output directory layout, naming, and organization S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants