diff --git a/bench/runner.nix b/bench/runner.nix index a49e925..dccb336 100644 --- a/bench/runner.nix +++ b/bench/runner.nix @@ -73,6 +73,7 @@ in wire_args="apply test --path $bench_dir/wire -vv --ssh-accept-host -p 10" wire_args_flake="apply test --path $HOME/wire-flake -vv --ssh-accept-host -p 10" + wire_args_flake_exp_client="apply test --path $HOME/wire-flake -vv --ssh-accept-host -p 10 --experimental-nix-client" colmena_args="apply test --config $bench_dir/colmena/hive.nix -v -p 10" colmena_args_flake="apply test --config $HOME/colmena-flake/flake.nix -v -p 10" @@ -81,6 +82,7 @@ in --export-markdown stats.md \ --export-json run.json \ "${lib.getExe self'.packages.wire-small} $wire_args_flake" -n "wire@HEAD - flake" \ + "${lib.getExe self'.packages.wire-small} $wire_args_flake_exp_client" -n "wire@HEAD & --experimental-nix-client - flake" \ "${lib.getExe' inputs.colmena_benchmarking.packages.x86_64-linux.colmena "colmena"} $colmena_args_flake" \ -n "colmena@pinned - flake" \ "${lib.getExe self'.packages.wire-small} $wire_args" -n "wire@HEAD - hive.nix" diff --git a/crates/core/src/cache/mod.rs b/crates/core/src/cache/mod.rs index 63d0721..85b9d77 100644 --- a/crates/core/src/cache/mod.rs +++ b/crates/core/src/cache/mod.rs @@ -11,7 +11,7 @@ use std::{ use itertools::Itertools; use sqlx::{ Pool, Sqlite, - migrate::{Migrator, MigrateError}, + migrate::{MigrateError, Migrator}, sqlite::{SqliteConnectOptions, SqlitePoolOptions}, }; use tokio::fs::create_dir_all; @@ -93,11 +93,11 @@ impl InspectionCache { Some(Self { pool }) } - async fn reset_migration( - pool: Pool, - cache_path: &Path, - ) -> Option> { - info!("failed to run cache migrations, resetting {}", cache_path.to_string_lossy()); + async fn reset_migration(pool: Pool, cache_path: &Path) -> Option> { + info!( + "failed to run cache migrations, resetting {}", + cache_path.to_string_lossy() + ); pool.close().await; diff --git a/crates/core/src/hive/steps/build.rs b/crates/core/src/hive/steps/build.rs index 503c9c7..0f6f165 100644 --- a/crates/core/src/hive/steps/build.rs +++ b/crates/core/src/hive/steps/build.rs @@ -7,10 +7,13 @@ use tracing::{debug, info, instrument}; use wire_nix_client::{DerivedPath, DerivedPathOutput, NixClient, NixDaemonClientError}; use crate::{ - HiveLibError, SafeStorePath, acquire_stdin_lock, commands::{ + HiveLibError, SafeStorePath, acquire_stdin_lock, + commands::{ CommandArguments, Either, WireCommandChip, builder::CommandStringBuilder, run_command_with_env, trace_nix_log_message, - }, hive::node::{Context, ExecuteStep, SharedTarget}, open_remote_client + }, + hive::node::{Context, ExecuteStep, SharedTarget}, + open_remote_client, }; const SYSTEM_OUTPUT: &str = "out";