Skip to content

Don't ignore default jobs = N in Werkfile #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
simonask merged 1 commit into from
Apr 27, 2025
Merged

Don't ignore default jobs = N in Werkfile #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions werk-cli/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,19 +674,19 @@ pub fn get_workspace_dir<'a>(
}

pub fn get_workspace_settings(
config: &werk_runner::ir::Defaults,
defaults: &werk_runner::ir::Defaults,
args: &Args,
workspace_dir: &Absolute<std::path::Path>,
color_stdout: ColorOutputKind,
) -> Result<WorkspaceSettings, Error> {
let out_dir = find_output_directory(
workspace_dir,
args.output_dir.as_deref(),
config.output_directory.as_deref(),
defaults.output_directory.as_deref(),
)?;

let mut settings = WorkspaceSettings::new(workspace_dir.to_owned());
settings.jobs = args.jobs.unwrap_or_else(num_cpus::get);
settings.jobs = args.jobs.or(defaults.jobs).unwrap_or_else(num_cpus::get);
settings.output_directory = out_dir;
for def in &args.define {
let Some((key, value)) = def.split_once('=') else {
Expand Down
4 changes: 2 additions & 2 deletions werk-runner/ir.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ pub struct Defaults {
pub explain: Option<bool>,
pub verbose: Option<bool>,
pub watch_delay: Option<i32>,
pub jobs: Option<i32>,
pub jobs: Option<usize>,
pub edition: Edition,
}

Expand All @@ -216,7 +216,7 @@ impl Defaults {
ast::DefaultStmt::Explain(entry) => defaults.explain = Some(entry.value.1),
ast::DefaultStmt::Verbose(entry) => defaults.verbose = Some(entry.value.1),
ast::DefaultStmt::WatchDelay(entry) => defaults.watch_delay = Some(entry.value.1),
ast::DefaultStmt::Jobs(entry) => defaults.jobs = Some(entry.value.1),
ast::DefaultStmt::Jobs(entry) => defaults.jobs = entry.value.1.try_into().ok(),
ast::DefaultStmt::Edition(entry) => {
if entry.value.1 == "v1" {
defaults.edition = Edition::V1;
Expand Down