mirror of
https://github.com/rust-lang/rust
synced 2024-11-05 20:45:15 +00:00
Rollup merge of #110118 - jyn514:download-error, r=Mark-Simulacrum
download-rustc: Give a better error message if artifacts can't be dowloaded It should be very rare in practice to happen; people would need to both have `download-ci-llvm` disabled and `download-rustc` enabled. I think it may be more common if we start turning this on by default, though. Helps with https://github.com/rust-lang/rust/issues/81930. Before: ``` downloading https://ci-artifacts.rust-lang.org/rustc-builds/bf5cad8e775fb326465e5c1b98693e5d259da156/rust-std-nightly-x86_64-unknown-linux-gnu.tar.xz curl: (22) The requested URL returned error: 404 ``` After: ``` downloading https://ci-artifacts.rust-lang.org/rustc-builds/bf5cad8e775fb326465e5c1b98693e5d259da156/rust-std-nightly-x86_64-unknown-linux-gnu.tar.xz curl: (22) The requested URL returned error: 404 error: failed to download pre-built rustc from CI note: old builds get deleted after a certain time help: if trying to compile an old commit of rustc, disable `download-rustc` in config.toml: [rust] download-rustc = false ```
This commit is contained in:
commit
b64d4c2f26
1 changed files with 12 additions and 1 deletions
|
@ -541,7 +541,18 @@ fn download_component(
|
|||
None
|
||||
};
|
||||
|
||||
self.download_file(&format!("{base_url}/{url}"), &tarball, "");
|
||||
let mut help_on_error = "";
|
||||
if destination == "ci-rustc" {
|
||||
help_on_error = "error: failed to download pre-built rustc from CI
|
||||
|
||||
note: old builds get deleted after a certain time
|
||||
help: if trying to compile an old commit of rustc, disable `download-rustc` in config.toml:
|
||||
|
||||
[rust]
|
||||
download-rustc = false
|
||||
";
|
||||
}
|
||||
self.download_file(&format!("{base_url}/{url}"), &tarball, help_on_error);
|
||||
if let Some(sha256) = checksum {
|
||||
if !self.verify(&tarball, sha256) {
|
||||
panic!("failed to verify {}", tarball.display());
|
||||
|
|
Loading…
Reference in a new issue