Skip to content

Conversation

@rami3l
Copy link
Member

@rami3l rami3l commented Dec 22, 2025

Mirrors rust-lang/rust#150289.

Similarly, as I'm new here, please feel free to point out any inconsistencies or any extra work I'll need to do to fully land this somewhat breaking change, including the order of merges, etc.

src/main.rs Outdated
// Construct the path that contains the documentation inside the tarball.
let tarball_dir = format!("{tarball_prefix}/rustc-docs/share/doc/rust/html");
let tarball_dir_new = format!("{tarball_dir}/rustc");
let tarball_dir_new = format!("{tarball_dir}/rustc-docs");
Copy link
Member

Choose a reason for hiding this comment

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

We generally want tip of promote release to work for all channels. This particular component probably doesn't matter too much but I'd rather write the code in a forwards and backwards compatible way... can we do something to support both the old and new way? Maybe check if either directory exists? Or include an empty flag file in the component that we can test for here?

Copy link
Member Author

@rami3l rami3l Dec 23, 2025

Choose a reason for hiding this comment

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

@Mark-Simulacrum Thanks! Would my new version look better in your opinion?

My understanding is that tar tf is used to probe the subpath within the archive and thus there is a fallback already based on whether that command returns 0 (non-zero for nonexistence). All I need to do this time is to add another fallback in the same layer, so that the fallback goes like ./rustc-docs -> ./rustc -> ./.

Also cc @jieyouxu

@rami3l rami3l marked this pull request as ready for review December 23, 2025 14:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants