Skip to content

Commit cca1b79

Browse files
authored
Rollup merge of rust-lang#58848 - GuillaumeGomez:fix-cache-issues, r=Mark-Simulacrum
Prevent cache issues on version updates Fixes rust-lang#58827. cc @rust-lang/infra
2 parents 02bd58e + 196e021 commit cca1b79

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

src/bootstrap/doc.rs

+7-8
Original file line numberDiff line numberDiff line change
@@ -343,12 +343,10 @@ fn invoke_rustdoc(
343343
.arg("--html-before-content").arg(&version_info)
344344
.arg("--html-in-header").arg(&favicon)
345345
.arg("--markdown-no-toc")
346-
.arg("--markdown-playground-url")
347-
.arg("https://play.rust-lang.org/")
348-
.arg("-o").arg(&out)
349-
.arg(&path)
350-
.arg("--markdown-css")
351-
.arg("../rust.css");
346+
.arg("--resource-suffix").arg(crate::channel::CFG_RELEASE_NUM)
347+
.arg("--markdown-playground-url").arg("https://play.rust-lang.org/")
348+
.arg("-o").arg(&out).arg(&path)
349+
.arg("--markdown-css").arg("../rust.css");
352350

353351
builder.run(&mut cmd);
354352
}
@@ -430,9 +428,9 @@ impl Step for Standalone {
430428
.arg("--html-before-content").arg(&version_info)
431429
.arg("--html-in-header").arg(&favicon)
432430
.arg("--markdown-no-toc")
431+
.arg("--resource-suffix").arg(crate::channel::CFG_RELEASE_NUM)
433432
.arg("--index-page").arg(&builder.src.join("src/doc/index.md"))
434-
.arg("--markdown-playground-url")
435-
.arg("https://play.rust-lang.org/")
433+
.arg("--markdown-playground-url").arg("https://play.rust-lang.org/")
436434
.arg("-o").arg(&out)
437435
.arg(&path);
438436

@@ -523,6 +521,7 @@ impl Step for Std {
523521
.arg("--markdown-css").arg("rust.css")
524522
.arg("--markdown-no-toc")
525523
.arg("--generate-redirect-pages")
524+
.arg("--resource-suffix").arg(crate::channel::CFG_RELEASE_NUM)
526525
.arg("--index-page").arg(&builder.src.join("src/doc/index.md"));
527526

528527
builder.run(&mut cargo);

0 commit comments

Comments
 (0)