huskies: merge 960

This commit is contained in:
dave
2026-05-13 13:17:46 +00:00
parent a47fbc4179
commit 77dc09668c
14 changed files with 138 additions and 193 deletions
+4 -6
View File
@@ -28,8 +28,7 @@ pub(crate) fn spawn_event_bridges(
if let Some(mut crdt_rx) = crate::crdt_state::subscribe() {
tokio::spawn(async move {
while let Ok(evt) = crdt_rx.recv().await {
if crate::pipeline_state::Stage::from_dir(&evt.to_stage)
.is_some_and(|s| matches!(s, crate::pipeline_state::Stage::Archived { .. }))
if matches!(evt.to_stage, crate::pipeline_state::Stage::Archived { .. })
&& let Some(root) = crdt_prune_root.as_ref().cloned()
{
let story_id = evt.story_id.clone();
@@ -42,14 +41,13 @@ pub(crate) fn spawn_event_bridges(
});
}
let (action, commit_msg) =
io::watcher::stage_metadata(&evt.to_stage, &evt.story_id)
.unwrap_or(("update", format!("huskies: update {}", evt.story_id)));
io::watcher::stage_metadata(&evt.to_stage, &evt.story_id);
let watcher_evt = io::watcher::WatcherEvent::WorkItem {
stage: evt.to_stage,
stage: evt.to_stage.dir_name().to_string(),
item_id: evt.story_id,
action: action.to_string(),
commit_msg,
from_stage: evt.from_stage,
from_stage: evt.from_stage.map(|s| s.dir_name().to_string()),
};
let _ = crdt_watcher_tx.send(watcher_evt);
}