Skip to content

Separate updating toolchain from adding essential files so they can have different retries #2232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 23, 2023
Merged

Separate updating toolchain from adding essential files so they can have different retries #2232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d12e97
Separate updating toolchain from adding essential files so they can h…
Nemo157 Sep 22, 2023
7494bda
Update toolchain before running build-tests
Nemo157 Oct 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/bin/cratesfyi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,14 @@ impl BuildSubcommand {
rustwide_builder()?
.update_toolchain()
.context("failed to update toolchain")?;

rustwide_builder()?
.purge_caches()
.context("failed to purge caches")?;

rustwide_builder()?
.add_essential_files()
.context("failed to add essential files")?;
}

Self::AddEssentialFiles => {
Expand Down
65 changes: 36 additions & 29 deletions src/build_queue.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,35 @@ impl BuildQueue {
Ok(())
}

fn update_toolchain(&self, builder: &mut RustwideBuilder) -> Result<()> {
let updated = retry(
|| {
builder
.update_toolchain()
.context("downloading new toolchain failed")
},
3,
)?;

if updated {
// toolchain has changed, purge caches
retry(
|| {
builder
.purge_caches()
.context("purging rustwide caches failed")
},
3,
)?;

builder
.add_essential_files()
.context("adding essential files failed")?;
}

Ok(())
}

/// Builds the top package from the queue. Returns whether there was a package in the queue.
///
/// Note that this will return `Ok(true)` even if the package failed to build.
Expand Down Expand Up @@ -460,35 +489,13 @@ impl BuildQueue {
return Err(err);
}

match retry(
|| {
builder
.update_toolchain()
.context("Updating toolchain failed, locking queue")
},
3,
) {
Err(err) => {
report_error(&err);
self.lock()?;
return Err(err);
}
Ok(true) => {
// toolchain has changed, purge caches
if let Err(err) = retry(
|| {
builder
.purge_caches()
.context("purging rustwide caches failed, locking queue")
},
3,
) {
report_error(&err);
self.lock()?;
return Err(err);
}
}
Ok(false) => {}
if let Err(err) = self
.update_toolchain(&mut *builder)
.context("Updating toolchain failed, locking queue")
{
report_error(&err);
self.lock()?;
return Err(err);
}

builder.build_package(&krate.name, &krate.version, kind)?;
Expand Down
22 changes: 14 additions & 8 deletions src/docbuilder/rustwide_builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,9 +222,6 @@ impl RustwideBuilder {
self.rustc_version = self.detect_rustc_version()?;

let has_changed = old_version.as_deref() != Some(&self.rustc_version);
if has_changed {
self.add_essential_files()?;
}
Ok(has_changed)
}

Expand Down Expand Up @@ -331,7 +328,6 @@ impl RustwideBuilder {
}

pub fn build_local_package(&mut self, path: &Path) -> Result<bool> {
self.update_toolchain()?;
let metadata = CargoMetadata::load_from_rustwide(&self.workspace, &self.toolchain, path)
.map_err(|err| {
err.context(format!("failed to load local package {}", path.display()))
Expand All @@ -348,8 +344,6 @@ impl RustwideBuilder {
) -> Result<bool> {
let mut conn = self.db.get()?;

self.update_toolchain()?;

info!("building package {} {}", name, version);

if is_blacklisted(&mut conn, name)? {
Expand Down Expand Up @@ -941,6 +935,7 @@ mod tests {
storage.store_one(&old_source_file, Vec::new())?;

let mut builder = RustwideBuilder::init(env).unwrap();
builder.update_toolchain()?;
assert!(builder.build_package(crate_, version, PackageKind::CratesIo)?);

// check release record in the db (default and other targets)
Expand Down Expand Up @@ -1066,6 +1061,7 @@ mod tests {
storage.store_one(&old_source_file, Vec::new())?;

let mut builder = RustwideBuilder::init(env).unwrap();
builder.update_toolchain()?;
assert!(!builder.build_package(crate_, version, PackageKind::CratesIo)?);

// check release record in the db (default and other targets)
Expand Down Expand Up @@ -1113,6 +1109,7 @@ mod tests {
let crate_ = "thiserror-impl";
let version = "1.0.26";
let mut builder = RustwideBuilder::init(env).unwrap();
builder.update_toolchain()?;
assert!(builder.build_package(crate_, version, PackageKind::CratesIo)?);

let storage = env.storage();
Expand All @@ -1136,6 +1133,7 @@ mod tests {
let crate_ = "windows-win";
let version = "2.4.1";
let mut builder = RustwideBuilder::init(env).unwrap();
builder.update_toolchain()?;
if builder.toolchain.as_ci().is_some() {
return Ok(());
}
Expand Down Expand Up @@ -1185,6 +1183,7 @@ mod tests {
let crate_ = "docs_rs_test_incorrect_lockfile";
let version = "0.1.2";
let mut builder = RustwideBuilder::init(env).unwrap();
builder.update_toolchain()?;
assert!(builder.build_package(crate_, version, PackageKind::CratesIo)?);

Ok(())
Expand All @@ -1207,6 +1206,7 @@ mod tests {
let crate_ = "docs_rs_test_incorrect_lockfile";
let version = "0.2.0";
let mut builder = RustwideBuilder::init(env).unwrap();
builder.update_toolchain()?;
assert!(builder.build_package(crate_, version, PackageKind::CratesIo)?);

Ok(())
Expand All @@ -1220,6 +1220,7 @@ mod tests {
let crate_ = "proc-macro2";
let version = "1.0.33";
let mut builder = RustwideBuilder::init(env).unwrap();
builder.update_toolchain()?;
assert!(builder.build_package(crate_, version, PackageKind::CratesIo)?);
Ok(())
});
Expand All @@ -1232,6 +1233,7 @@ mod tests {
let crate_ = "serde";
let version = "1.0.152";
let mut builder = RustwideBuilder::init(env).unwrap();
builder.update_toolchain()?;
assert!(builder.build_package(crate_, version, PackageKind::CratesIo)?);

let mut conn = env.db().conn();
Expand All @@ -1258,6 +1260,7 @@ mod tests {
let crate_ = "stylish-core";
let version = "0.1.1";
let mut builder = RustwideBuilder::init(env).unwrap();
builder.update_toolchain()?;
assert!(builder.build_package(crate_, version, PackageKind::CratesIo)?);

let mut conn = env.db().conn();
Expand All @@ -1281,8 +1284,9 @@ mod tests {
#[ignore]
fn test_build_std() {
wrapper(|env| {
assert!(RustwideBuilder::init(env)?
.build_local_package(Path::new("tests/crates/build-std"))?);
let mut builder = RustwideBuilder::init(env)?;
builder.update_toolchain()?;
assert!(builder.build_local_package(Path::new("tests/crates/build-std"))?);
Ok(())
})
}
Expand All @@ -1292,6 +1296,7 @@ mod tests {
fn test_workspace_reinitialize_at_once() {
wrapper(|env| {
let mut builder = RustwideBuilder::init(env)?;
builder.update_toolchain()?;
builder.reinitialize_workspace_if_interval_passed(env)?;
assert!(builder.build_local_package(Path::new("tests/crates/build-std"))?);
Ok(())
Expand All @@ -1308,6 +1313,7 @@ mod tests {
cfg.build_workspace_reinitialization_interval = Duration::from_secs(1)
});
let mut builder = RustwideBuilder::init(env)?;
builder.update_toolchain()?;
assert!(builder.build_local_package(Path::new("tests/crates/build-std"))?);
sleep(Duration::from_secs(1));
builder.reinitialize_workspace_if_interval_passed(env)?;
Expand Down