Skip to content

perf(builder): skip coverage for non-default targets #3324

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

Closed
syphar wants to merge 1 commit into from
Closed

perf(builder): skip coverage for non-default targets #3324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 0 additions & 23 deletions .sqlx/query-1fc879cc103367a688f9f7bcc079df8f6419c177167ae0bfe8685033b6b8709e.json
View file
Open in desktop

This file was deleted.

35 changes: 35 additions & 0 deletions .sqlx/query-c54d439fab2d5393f5063b1f12b335259019b9e456f68dee9fcf3615581d27b5.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 0 additions & 23 deletions ...builder/.sqlx/query-1fc879cc103367a688f9f7bcc079df8f6419c177167ae0bfe8685033b6b8709e.json
View file
Open in desktop

This file was deleted.

35 changes: 35 additions & 0 deletions ...builder/.sqlx/query-c54d439fab2d5393f5063b1f12b335259019b9e456f68dee9fcf3615581d27b5.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 17 additions & 6 deletions crates/bin/docs_rs_builder/src/docbuilder/rustwide_builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,7 @@ impl RustwideBuilder {
build,
&limits,
&metadata,
false,
true,
false,
)?;
Expand Down Expand Up @@ -675,7 +676,7 @@ impl RustwideBuilder {

// Perform an initial build
let mut res =
self.execute_build(build_id, name, version, default_target, true, build, &limits, &metadata, false, collect_metrics)?;
self.execute_build(build_id, name, version, default_target, true, build, &limits, &metadata, true, false, collect_metrics)?;

// If the build fails with the lockfile given, try using only the dependencies listed in Cargo.toml.
let cargo_lock = build.host_source_dir().join("Cargo.lock");
Expand All @@ -697,7 +698,7 @@ impl RustwideBuilder {
.run_capture()?;
}
res =
self.execute_build(build_id, name, version, default_target, true, build, &limits, &metadata, false, collect_metrics)?;
self.execute_build(build_id, name, version, default_target, true, build, &limits, &metadata, true, false, collect_metrics)?;
}

if res.successful()
Expand Down Expand Up @@ -932,6 +933,7 @@ impl RustwideBuilder {
limits,
metadata,
false,
false,
collect_metrics,
)?;
if target_res.successful() {
Expand Down Expand Up @@ -1109,6 +1111,7 @@ impl RustwideBuilder {
build: &Build,
limits: &Limits,
metadata: &Metadata,
gather_coverage: bool,
create_essential_files: bool,
collect_metrics: bool,
) -> Result<FullBuildResult> {
Expand Down Expand Up @@ -1136,10 +1139,10 @@ impl RustwideBuilder {

let mut aggregated_build_stats = ProcessStatistics::default();

// we have to run coverage before the doc-build because currently it
// We have to run coverage before the doc-build because currently it
// deletes the doc-target folder.
// https://github.com/rust-lang/cargo/issues/9447
let (coverage_stats, doc_coverage) =
let (coverage_stats, doc_coverage) = if gather_coverage {
match self.get_coverage(target, build, metadata, limits) {
Ok((stats, cov)) => (stats, cov),
Err(err) => {
Expand All @@ -1149,7 +1152,10 @@ impl RustwideBuilder {
);
(ProcessStatistics::default(), None)
}
};
}
} else {
(ProcessStatistics::default(), None)
};

aggregated_build_stats.merge_mut(coverage_stats);

Expand Down Expand Up @@ -2258,10 +2264,13 @@ mod tests {
let row = block_on_async_with_conn!(env, |mut conn| async {
sqlx::query!(
r#"SELECT
r.doc_targets
r.doc_targets,
cov.total_items,
cov.documented_items
FROM
crates as c
INNER JOIN releases AS r ON c.id = r.crate_id
LEFT OUTER JOIN doc_coverage AS cov ON r.id = cov.release_id
WHERE
c.name = $1 AND
r.version = $2"#,
Expand All @@ -2285,6 +2294,8 @@ mod tests {
assert_contains(&targets, "x86_64-apple-darwin");
// Part of the default targets.
assert_contains(&targets, "aarch64-apple-darwin");
assert!(row.total_items.unwrap() > 0);
assert!(row.documented_items.unwrap() > 0);

Ok(())
}
Expand Down
Loading