Add support for more recent nightlies than the manifest supports

This commit is contained in:
nora 2024-09-08 12:18:30 +02:00
parent 262e8acd9f
commit 4671f871a6
4 changed files with 131 additions and 6 deletions

View file

@ -15,7 +15,7 @@ use tracing::{debug, info};
use crate::{
db::{BuildMode, Db, FullBuildInfo, Status},
nightlies::Nightlies,
nightlies::{Nightlies, NightlyCache},
};
pub struct Toolchain(String);
@ -36,8 +36,9 @@ impl Display for Toolchain {
}
pub async fn background_builder(db: Db) -> Result<()> {
let mut nightly_cache = NightlyCache::default();
loop {
let nightlies = Nightlies::fetch().await.wrap_err("fetching nightlies")?;
let nightlies = Nightlies::fetch(&mut nightly_cache).await.wrap_err("fetching nightlies")?;
let already_finished = db
.finished_nightlies()
.await

View file

@ -1,21 +1,29 @@
use std::collections::HashSet;
use std::hash::RandomState;
use color_eyre::eyre::Context;
use color_eyre::eyre::{Context, OptionExt};
use color_eyre::Result;
use reqwest::StatusCode;
use time::Duration;
use tracing::debug;
use crate::db::{BuildMode, FinishedNightly};
const EARLIEST_CUTOFF_DATE: &str = "2023-01-01";
#[derive(Default)]
pub struct NightlyCache {
/// Nightlies that exist.
exists: HashSet<String>,
}
/// All nightlies that exist.
pub struct Nightlies {
all: Vec<String>,
}
impl Nightlies {
pub async fn fetch() -> Result<Nightlies> {
pub async fn fetch(cache: &mut NightlyCache) -> Result<Nightlies> {
let manifests = reqwest::get("https://static.rust-lang.org/manifests.txt")
.await
.wrap_err("fetching https://static.rust-lang.org/manifests.txt")?
@ -26,8 +34,27 @@ impl Nightlies {
.into_iter()
.filter(|date| date.as_str() > EARLIEST_CUTOFF_DATE)
.collect::<Vec<_>>();
all.sort_by(|a, b| b.cmp(a));
debug!("Loaded {} nightlies from the manifest", all.len());
all.sort();
// The manifests is only updated weekly, which means new nightlies won't be contained.
// We probe for their existence.
let latest = all
.last()
.ok_or_eyre("did not find any nightlies in manifets.txt")?;
for nightly in guess_more_recent_nightlies(&latest)? {
if nightly_exists(&nightly, cache)
.await
.wrap_err_with(|| format!("checking whether {nightly} exists"))?
{
all.push(nightly);
}
}
all.reverse();
debug!("Loaded {} nightlies from the manifest and manual additions", all.len());
Ok(Self { all })
}
@ -62,6 +89,31 @@ fn nightlies_from_manifest(manifest: &str) -> Vec<String> {
.collect()
}
fn guess_more_recent_nightlies(latest: &str) -> Result<Vec<String>> {
let format = time::macros::format_description!("[year]-[month]-[day]");
let latest = time::Date::parse(latest, format).wrap_err("latest nightly has invalid format")?;
// manifests.txt is updated weekly, so let's try 8 just in case.
Ok((1..=8)
.filter_map(|offset| latest.checked_add(Duration::days(offset)))
.map(|date| date.format(format).unwrap())
.collect())
}
async fn nightly_exists(nightly: &str, cache: &mut NightlyCache) -> Result<bool> {
if cache.exists.contains(nightly) {
return Ok(true);
}
let url = format!("https://static.rust-lang.org/dist/{nightly}/channel-rust-nightly.toml");
let resp = reqwest::get(&url).await.wrap_err("fetching channel")?;
debug!(%nightly, %url, status = %resp.status(), "Checked whether a recent nightly exists");
let exists = resp.status() == StatusCode::OK;
if exists {
cache.exists.insert(nightly.to_owned());
}
Ok(exists)
}
#[cfg(test)]
mod tests {
#[test]
@ -74,4 +126,22 @@ static.rust-lang.org/dist/2024-08-23/channel-rust-nightly.toml";
let nightlies = super::nightlies_from_manifest(&test_manifest);
assert_eq!(nightlies, vec!["2024-08-22", "2024-08-23"]);
}
#[test]
fn guess() {
let nightlies = super::guess_more_recent_nightlies("2024-08-28").unwrap();
assert_eq!(
nightlies,
[
"2024-08-29",
"2024-08-30",
"2024-08-31",
"2024-09-01",
"2024-09-02",
"2024-09-03",
"2024-09-04",
"2024-09-05",
]
);
}
}