actions/cargo-binstall
1
0
Fork 0
mirror of https://github.com/cargo-bins/cargo-binstall.git synced 2025-05-09 05:20:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix metafile updating: Update them in entry only

Browse source 
to avoid race condition.

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2022-07-22 17:58:29 +10:00
parent 488e7b8492
commit 92f4d0af95
No known key found for this signature in database
GPG key ID: 591C0B03040416D6
3 changed files with 63 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

49
src/main.rs
View file

@ -12,7 +12,7 @@ use log::{debug, error, info, warn, LevelFilter};
use miette::{miette, Result, WrapErr};
use simplelog::{ColorChoice, ConfigBuilder, TermLogger, TerminalMode};
use tempfile::TempDir;
use tokio::{runtime::Runtime, task::JoinError};
use tokio::{runtime::Runtime, task::block_in_place};
use cargo_binstall::{binstall, *};
@ -330,18 +330,45 @@ async fn entry(jobserver_client: LazyJobserverClient) -> Result<()> {
.collect()
};
let mut metadata_vec = Vec::with_capacity(tasks.len());
for task in tasks {
await_task(task).await?;
if let Some(metadata) = await_task(task).await? {
metadata_vec.push(metadata);
}
}
if opts.no_cleanup {
// Consume temp_dir without removing it from fs.
temp_dir.into_path();
} else {
temp_dir.close().unwrap_or_else(|err| {
warn!("Failed to clean up some resources: {err}");
});
}
block_in_place(|| {
debug!("Writing .crates.toml");
metafiles::v1::CratesToml::append(
metadata_vec
.iter()
.map(|metadata| (&metadata.cvs, metadata.bins.clone())),
)?;
Ok(())
debug!("Writing .crates2.json");
metafiles::v2::Crates2Json::append(metadata_vec.into_iter().map(|metadata| {
(
metadata.cvs,
metafiles::v2::CrateInfo {
version_req: Some(metadata.version_req),
bins: metadata.bins,
profile: "release".into(),
target: metadata.target,
rustc: format!("{} {}", env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION")),
..Default::default()
},
)
}))?;
if opts.no_cleanup {
// Consume temp_dir without removing it from fs.
temp_dir.into_path();
} else {
temp_dir.close().unwrap_or_else(|err| {
warn!("Failed to clean up some resources: {err}");
});
}
Ok(())
})
}