Skip to content

fix(main)!: change dist path for rustc-docs #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mark-Simulacrum merged 1 commit into from
Dec 28, 2025
Merged

fix(main)!: change dist path for rustc-docs #101

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 31 additions & 28 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,36 +507,39 @@ impl Context {
fs::create_dir_all(&rustc_docs)?;

// 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");

if Command::new("tar")
.arg("tf")
.arg(&tarball)
.arg(&tarball_dir_new)
.current_dir(&rustc_docs)
.output()?
.status
.success()
{
// Unpack the rustc documentation into the new directory.
// // Touch all files as well (see above for why).
run(Command::new("tar")
.arg("xfm")
.arg(&tarball)
.arg("--strip-components=7")
.arg(&tarball_dir_new)
.current_dir(&rustc_docs))?;
} else {
// Unpack the rustc documentation into the new directory.
// Touch all files as well (see above for why).
run(Command::new("tar")
.arg("xfm")
let tarball_dir_base = format!("{tarball_prefix}/rustc-docs/share/doc/rust/html");

// NOTE: The following logic is to accommodate the 2 latest `rustc-docs` structures:
// - New path: `share/doc/rust/html/rustc-docs/...`
// - Old path (fallback): `share/doc/rust/html/rustc/...`
let mut tarball_dir = None;
for subdir in ["rustc-docs", "rustc"] {
let candidate = format!("{tarball_dir_base}/{subdir}");
if Command::new("tar")
.arg("tf")
.arg(&tarball)
.arg("--strip-components=6")
.arg(&tarball_dir)
.current_dir(&rustc_docs))?;
.arg(&candidate)
.current_dir(&rustc_docs)
.output()?
.status
.success()
{
// The candidate directory exists in the tarball.
tarball_dir = Some(candidate);
break;
}
}
let Some(tarball_dir) = tarball_dir else {
anyhow::bail!("could not find the rustc documentation in the tarball");
};
// Unpack the rustc documentation into the new directory.
// Touch all files as well (see above for why).
run(Command::new("tar")
.arg("xfm")
.arg(&tarball)
.arg("--strip-components=7")
.arg(&tarball_dir)
.current_dir(&rustc_docs))?;
}

// Upload this to `/doc/$channel`
Expand Down