c8cb7bdf57
# Objective Fixes #16051 Closes #16145 ## Solution Allow passing `--build-jobs` and `--test-threads` to `ci` i.e. ``` cargo run -p ci -- --build-jobs 4 --test-threads 4 ``` ## Testing running ci locally --------- Co-authored-by: Benjamin Brienen <Benjamin.Brienen@outlook.com>
82 lines
2.5 KiB
Rust
82 lines
2.5 KiB
Rust
use crate::args::Args;
|
|
|
|
/// Trait for preparing a subcommand to be run.
|
|
pub trait Prepare {
|
|
/// A method that returns a list of [`PreparedCommand`]s to be run for a given shell and flags.
|
|
///
|
|
/// # Example
|
|
///
|
|
/// ```
|
|
/// # use crate::{args::Args, Prepare, PreparedCommand};
|
|
/// # use argh::FromArgs;
|
|
/// # use xshell::Shell;
|
|
/// #
|
|
/// #[derive(FromArgs)]
|
|
/// #[argh(subcommand, name = "check")]
|
|
/// struct CheckCommand {}
|
|
///
|
|
/// impl Prepare for CheckCommand {
|
|
/// fn prepare<'a>(&self, sh: &'a Shell, args: Args) -> Vec<PreparedCommand<'a>> {
|
|
/// vec![PreparedCommand::new::<Self>(
|
|
/// cmd!(sh, "cargo check --workspace"),
|
|
/// "Please fix linter errors",
|
|
/// )]
|
|
/// }
|
|
/// }
|
|
/// ```
|
|
fn prepare<'a>(&self, sh: &'a xshell::Shell, args: Args) -> Vec<PreparedCommand<'a>>;
|
|
}
|
|
|
|
/// A command with associated metadata, created from a command that implements [`Prepare`].
|
|
#[derive(Debug)]
|
|
pub struct PreparedCommand<'a> {
|
|
/// The name of the command.
|
|
pub name: &'static str,
|
|
|
|
/// The command to execute
|
|
pub command: xshell::Cmd<'a>,
|
|
|
|
/// The message to display if the test command fails
|
|
pub failure_message: &'static str,
|
|
|
|
/// The subdirectory path to run the test command within
|
|
pub subdir: Option<&'static str>,
|
|
|
|
/// Environment variables that need to be set before the test runs
|
|
pub env_vars: Vec<(&'static str, &'static str)>,
|
|
}
|
|
|
|
impl<'a> PreparedCommand<'a> {
|
|
/// Creates a new [`PreparedCommand`] from a [`Cmd`] and a failure message.
|
|
///
|
|
/// The other fields of [`PreparedCommand`] are filled in with their default values.
|
|
///
|
|
/// For more information about creating a [`Cmd`], please see the [`cmd!`](xshell::cmd) macro.
|
|
///
|
|
/// [`Cmd`]: xshell::Cmd
|
|
pub fn new<T: argh::SubCommand>(
|
|
command: xshell::Cmd<'a>,
|
|
failure_message: &'static str,
|
|
) -> Self {
|
|
Self {
|
|
command,
|
|
name: T::COMMAND.name,
|
|
failure_message,
|
|
subdir: None,
|
|
env_vars: vec![],
|
|
}
|
|
}
|
|
|
|
/// A builder that overwrites the current sub-directory with a new value.
|
|
pub fn with_subdir(mut self, subdir: &'static str) -> Self {
|
|
self.subdir = Some(subdir);
|
|
self
|
|
}
|
|
|
|
/// A builder that adds a new environmental variable to the list.
|
|
pub fn with_env_var(mut self, key: &'static str, value: &'static str) -> Self {
|
|
self.env_vars.push((key, value));
|
|
self
|
|
}
|
|
}
|