Skip to content

Commit 8c8c7cf

Browse files
committed
Give a better error message when the CI download fails
1 parent c485ee7 commit 8c8c7cf

File tree

1 file changed

+67
-7
lines changed

1 file changed

+67
-7
lines changed

src/bootstrap/src/core/download.rs

+67-7
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ use std::{
66
path::{Path, PathBuf},
77
process::{Command, Stdio},
88
sync::OnceLock,
9+
time::SystemTime,
910
};
1011

1112
use build_helper::ci::CiEnv;
@@ -194,7 +195,7 @@ impl Config {
194195
let _ = try_run(self, patchelf.arg(fname));
195196
}
196197

197-
fn download_file(&self, url: &str, dest_path: &Path, help_on_error: &str) {
198+
fn download_file(&self, url: &str, dest_path: &Path, help_on_error: &str, commit: &String) {
198199
self.verbose(&format!("download {url}"));
199200
// Use a temporary file in case we crash while downloading, to avoid a corrupt download in cache/.
200201
let tempfile = self.tempdir().join(dest_path.file_name().unwrap());
@@ -203,7 +204,7 @@ impl Config {
203204
// protocols without worrying about merge conflicts if we change the HTTP implementation.
204205
match url.split_once("://").map(|(proto, _)| proto) {
205206
Some("http") | Some("https") => {
206-
self.download_http_with_retries(&tempfile, url, help_on_error)
207+
self.download_http_with_retries(&tempfile, url, help_on_error, commit)
207208
}
208209
Some(other) => panic!("unsupported protocol {other} in {url}"),
209210
None => panic!("no protocol in {url}"),
@@ -214,7 +215,13 @@ impl Config {
214215
);
215216
}
216217

217-
fn download_http_with_retries(&self, tempfile: &Path, url: &str, help_on_error: &str) {
218+
fn download_http_with_retries(
219+
&self,
220+
tempfile: &Path,
221+
url: &str,
222+
help_on_error: &str,
223+
commit: &String,
224+
) {
218225
println!("downloading {url}");
219226
// Try curl. If that fails and we are on windows, fallback to PowerShell.
220227
let mut curl = Command::new("curl");
@@ -250,19 +257,67 @@ impl Config {
250257
"(New-Object System.Net.WebClient).DownloadFile('{}', '{}')",
251258
url, tempfile.to_str().expect("invalid UTF-8 not supported with powershell downloads"),
252259
),
253-
])).is_err() {
260+
])).is_ok() {
254261
return;
255262
}
256263
eprintln!("\nspurious failure, trying again");
257264
}
258265
}
259266
if !help_on_error.is_empty() {
260267
eprintln!("{help_on_error}");
268+
Self::check_outdated(commit);
261269
}
262270
crate::exit!(1);
263271
}
264272
}
265273

274+
fn check_outdated(commit: &String) {
275+
let build_date: String = String::from_utf8(
276+
Command::new("git")
277+
.arg("show")
278+
.arg("-s")
279+
.arg("--format=%ct")
280+
.arg(commit)
281+
.output()
282+
.unwrap()
283+
.stdout,
284+
)
285+
.unwrap_or("".to_string());
286+
match SystemTime::now().duration_since(SystemTime::UNIX_EPOCH) {
287+
Ok(n) => {
288+
let replaced = build_date.trim();
289+
let diff = n.as_secs() - replaced.parse::<u64>().unwrap();
290+
if diff >= 165 * 24 * 60 * 60 {
291+
let build_date: String = String::from_utf8(
292+
Command::new("git")
293+
.arg("show")
294+
.arg("-s")
295+
.arg("--format=%ar")
296+
.arg(commit)
297+
.output()
298+
.unwrap()
299+
.stdout,
300+
)
301+
.unwrap_or("".to_string());
302+
if build_date.is_empty() {
303+
eprintln!(
304+
"NOTE: tried to download builds for {}, CI builds will be gone in 168 days",
305+
commit
306+
);
307+
} else {
308+
eprintln!(
309+
"NOTE: tried to download builds for {} (from {}), CI builds will be gone in 168 days",
310+
commit, build_date
311+
);
312+
}
313+
eprintln!("HELP: Consider updating your copy of the rust sources");
314+
return;
315+
}
316+
}
317+
Err(_) => panic!("SystemTime before UNIX EPOCH!"),
318+
}
319+
}
320+
266321
fn unpack(&self, tarball: &Path, dst: &Path, pattern: &str) {
267322
eprintln!("extracting {} to {}", tarball.display(), dst.display());
268323
if !dst.exists() {
@@ -492,7 +547,7 @@ impl Config {
492547
let extra_components = ["cargo"];
493548

494549
let download_beta_component = |config: &Config, filename, prefix: &_, date: &_| {
495-
config.download_component(DownloadSource::Dist, filename, prefix, date, "stage0")
550+
config.download_component(DownloadSource::Dist, filename, prefix, date, "stage0");
496551
};
497552

498553
self.download_toolchain(
@@ -648,7 +703,7 @@ HELP: if trying to compile an old commit of rustc, disable `download-rustc` in c
648703
download-rustc = false
649704
";
650705
}
651-
self.download_file(&format!("{base_url}/{url}"), &tarball, help_on_error);
706+
self.download_file(&format!("{base_url}/{url}"), &tarball, help_on_error, &key.to_string());
652707
if let Some(sha256) = checksum {
653708
if !self.verify(&tarball, sha256) {
654709
panic!("failed to verify {}", tarball.display());
@@ -726,7 +781,12 @@ download-rustc = false
726781
[llvm]
727782
download-ci-llvm = false
728783
";
729-
self.download_file(&format!("{base}/{llvm_sha}/{filename}"), &tarball, help_on_error);
784+
self.download_file(
785+
&format!("{base}/{llvm_sha}/{filename}"),
786+
&tarball,
787+
help_on_error,
788+
&llvm_sha.to_string(),
789+
);
730790
}
731791
let llvm_root = self.ci_llvm_root();
732792
self.unpack(&tarball, &llvm_root, "rust-dev");

0 commit comments

Comments
 (0)