resolve rustdoc incompatibility with rust.download-rustc=true + rust.channel= beta/stable
#126153
Conversation
|
rustbot has assigned @Mark-Simulacrum. Use |
|
This PR modifies If appropriate, please update |
rustbot
added
S-waiting-on-review
onur-ozkan
force-pushed
the
fix-rustdoc-issue-with-ci-rustc
branch
from
32fe89b to
5719f75
Compare
| } | ||
| } | ||
|
|
||
| // FIXME: handle download-rustc incompatible options. |
There was a problem hiding this comment.
We already have several incompatibility checks for download-rustc, but I believe we can further expand them. I'm unsure about which options we can check, so I'll leave this FIXME to revisit later.
src/bootstrap/src/core/builder.rs
Outdated
| @@ -1039,6 +1039,10 @@ impl<'a> Builder<'a> { | |||
|
|
|||
| pub fn doc_rust_lang_org_channel(&self) -> String { | |||
| let channel = match &*self.config.channel { | |||
| // When using precompiled nightly compiler from CI, we need to use CI rustc's channel and | |||
There was a problem hiding this comment.
The downloaded compiler isn't nightly if it's being downloaded while building a new beta, right? So I think this needs to use the logic we have for detecting channel...
Previously, we were unable to use `rust.download-rustc` with the beta or stable channel settings through `rust.channel` due to breaking rustdoc UI tests. This was because when using a precompiled nightly compiler from CI, we must use the channel of precompiled compiler and ignore `rust.channel` from the configuration. This change addresses that issue in `Builder::doc_rust_lang_org_channel` and allows rustdoc UI tests to work with the precompiled compiler even if the channel specified in config.toml is "beta" or "stable". Signed-off-by: onur-ozkan <[email protected]>
This check is no longer needed as rustdoc ui tests works with any channel + precompiled compiler. Signed-off-by: onur-ozkan <[email protected]>
onur-ozkan
force-pushed
the
fix-rustdoc-issue-with-ci-rustc
branch
from
5719f75 to
99c5476
Compare
|
@bors r=Mark-Simulacrum rollup |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
|
Finished benchmarking commit (d2fb97f): comparison URL. Overall result: ❌ regressions - no action needed@rustbot label: -perf-regression Instruction countThis is a highly reliable metric that was used to determine the overall result at the top of this comment.
Max RSS (memory usage)Results (primary 4.9%)This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.
CyclesThis benchmark run did not return any relevant results for this metric. Binary sizeThis benchmark run did not return any relevant results for this metric. Bootstrap: missing data |
Previously, we were unable to use
rust.download-rustcwith the beta or stablechannel settings through
rust.channeldue to breaking rustdoc UI tests.This was because when using a precompiled nightly compiler from CI, we must use the
channel of precompiled compiler and ignore
rust.channelfrom the configuration.This change addresses that issue in
Builder::doc_rust_lang_org_channeland allows rustdocUI tests to work with the precompiled compiler even if the channel specified in config.toml is
"beta" or "stable".
Blocker for #122709