first json build worked

Author: syphar

src/docbuilder/rustwide_builder.rs

@@ -24,6 +24,7 @@ use crate::{AsyncStorage, Config, Context, InstanceMetrics, RegistryApi, Storage
 use crate::{db::blacklist::is_blacklisted, utils::MetadataPackage};
 use anyhow::{Context as _, Error, anyhow, bail};
 use docsrs_metadata::{BuildTargets, DEFAULT_TARGETS, HOST_TARGET, Metadata};
+use itertools::Itertools;
 use once_cell::sync::Lazy;
 use regex::Regex;
 use rustwide::cmd::{Command, CommandError, SandboxBuilder, SandboxImage};
@@ -611,7 +612,7 @@ impl RustwideBuilder {
                     // Limit the number of targets so that no one can try to build all 200000 possible targets
                     for target in other_targets.into_iter().take(limits.targets()) {
                         debug!("building package {} {} for {}", name, version, target);
-                        self.execute_json_build(build_id, name, version, default_target, build, &metadata, &limits)?;
+                        self.execute_json_build(build_id, name, version, target, build, &metadata, &limits)?;
                         let target_res = self.build_target(
                             target,
                             build,
@@ -850,7 +851,8 @@ impl RustwideBuilder {
             let _span = info_span!("store_json_build_logs").entered();
             let build_log_path = format!("build-logs/{build_id}/{target}_json.txt");
             self.storage
-                .store_one(build_log_path, storage.to_string())?;
+                .store_one(build_log_path, storage.to_string())
+                .context("storing build log on S3")?;
         }
 
         if !successful {
@@ -859,7 +861,7 @@ impl RustwideBuilder {
             return Ok(());
         }
 
-        let Some(json_filename) = fs::read_dir(build.host_target_dir().join("doc"))?
+        let Some(json_filename) = fs::read_dir(build.host_target_dir().join(target).join("doc"))?
             .filter_map(|entry| {
                 let entry = entry.ok()?;
                 let path = entry.path();