A couple of fixes to progress output
Need to have some integration tests.
This commit is contained in:
parent
b3016ad3a7
commit
572f77dbf5
3 changed files with 8 additions and 5 deletions
|
@ -284,6 +284,7 @@ impl Deployment {
|
||||||
// FIXME: Remote builder?
|
// FIXME: Remote builder?
|
||||||
let nix_options = self.hive.nix_options().await.unwrap();
|
let nix_options = self.hive.nix_options().await.unwrap();
|
||||||
let mut builder = host::local(nix_options);
|
let mut builder = host::local(nix_options);
|
||||||
|
builder.set_job(Some(job.clone()));
|
||||||
|
|
||||||
let map = derivation.realize(&mut *builder).await?;
|
let map = derivation.realize(&mut *builder).await?;
|
||||||
|
|
||||||
|
|
|
@ -93,6 +93,10 @@ impl Host for Local {
|
||||||
async fn active_derivation_known(&mut self) -> NixResult<bool> {
|
async fn active_derivation_known(&mut self) -> NixResult<bool> {
|
||||||
Ok(true)
|
Ok(true)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn set_job(&mut self, job: Option<JobHandle>) {
|
||||||
|
self.job = job;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Local {
|
impl Local {
|
||||||
|
|
|
@ -74,6 +74,9 @@ pub trait Host: Send + Sync + std::fmt::Debug {
|
||||||
/// exist on the host.
|
/// exist on the host.
|
||||||
async fn realize_remote(&mut self, derivation: &StorePath) -> NixResult<Vec<StorePath>>;
|
async fn realize_remote(&mut self, derivation: &StorePath) -> NixResult<Vec<StorePath>>;
|
||||||
|
|
||||||
|
/// Provides a JobHandle to use during operations.
|
||||||
|
fn set_job(&mut self, bar: Option<JobHandle>);
|
||||||
|
|
||||||
/// Realizes the specified local derivation on the host then retrieves the outputs.
|
/// Realizes the specified local derivation on the host then retrieves the outputs.
|
||||||
async fn realize(&mut self, derivation: &StorePath) -> NixResult<Vec<StorePath>> {
|
async fn realize(&mut self, derivation: &StorePath) -> NixResult<Vec<StorePath>> {
|
||||||
let options = CopyOptions::default();
|
let options = CopyOptions::default();
|
||||||
|
@ -122,9 +125,4 @@ pub trait Host: Send + Sync + std::fmt::Debug {
|
||||||
async fn run_command(&mut self, command: &[&str]) -> NixResult<()> {
|
async fn run_command(&mut self, command: &[&str]) -> NixResult<()> {
|
||||||
Err(NixError::Unsupported)
|
Err(NixError::Unsupported)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Provides a JobHandle to use during operations.
|
|
||||||
#[allow(unused_variables)]
|
|
||||||
fn set_job(&mut self, bar: Option<JobHandle>) {
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue