huskies: merge 1018
This commit is contained in:
@@ -139,6 +139,12 @@ pub struct ProjectConfig {
|
||||
/// unaffected. Default: `true`.
|
||||
#[serde(default = "default_status_push_enabled")]
|
||||
pub status_push_enabled: bool,
|
||||
/// Number of consecutive `MergeFailure` transitions before a story is
|
||||
/// automatically blocked. The auto-block subscriber resets the counter
|
||||
/// whenever the story leaves `MergeFailure` (e.g. after a successful
|
||||
/// merge or `FixupRequested`). Default: 3. Set to 0 to disable.
|
||||
#[serde(default = "default_merge_failure_block_threshold")]
|
||||
pub merge_failure_block_threshold: u32,
|
||||
}
|
||||
|
||||
/// Configuration for the filesystem watcher's sweep behaviour.
|
||||
@@ -210,6 +216,10 @@ fn default_status_push_enabled() -> bool {
|
||||
true
|
||||
}
|
||||
|
||||
fn default_merge_failure_block_threshold() -> u32 {
|
||||
3
|
||||
}
|
||||
|
||||
fn default_max_mesh_peers() -> usize {
|
||||
3
|
||||
}
|
||||
@@ -368,6 +378,7 @@ impl Default for ProjectConfig {
|
||||
gateway_url: None,
|
||||
gateway_project: None,
|
||||
status_push_enabled: default_status_push_enabled(),
|
||||
merge_failure_block_threshold: default_merge_failure_block_threshold(),
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -457,6 +468,7 @@ impl ProjectConfig {
|
||||
gateway_url: None,
|
||||
gateway_project: None,
|
||||
status_push_enabled: default_status_push_enabled(),
|
||||
merge_failure_block_threshold: default_merge_failure_block_threshold(),
|
||||
};
|
||||
validate_agents(&config.agent)?;
|
||||
return Ok(config);
|
||||
@@ -497,6 +509,7 @@ impl ProjectConfig {
|
||||
gateway_url: None,
|
||||
gateway_project: None,
|
||||
status_push_enabled: default_status_push_enabled(),
|
||||
merge_failure_block_threshold: default_merge_failure_block_threshold(),
|
||||
};
|
||||
validate_agents(&config.agent)?;
|
||||
Ok(config)
|
||||
@@ -525,6 +538,7 @@ impl ProjectConfig {
|
||||
gateway_url: None,
|
||||
gateway_project: None,
|
||||
status_push_enabled: default_status_push_enabled(),
|
||||
merge_failure_block_threshold: default_merge_failure_block_threshold(),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user