From 23c1e7064d577f0d04844bcd6e5ea0a170e9523b Mon Sep 17 00:00:00 2001 From: Guillaume Bouvignies Date: Mon, 15 Jan 2024 15:23:33 +0100 Subject: [PATCH] fix!: git sync branch name no contains the workspace ID and the type (#3004) --- backend/windmill-git-sync/src/lib.rs | 4 ++++ .../routes/(root)/(logged)/workspace_settings/+page.svelte | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/backend/windmill-git-sync/src/lib.rs b/backend/windmill-git-sync/src/lib.rs index 34a848f31f..0b4f7d2cb1 100644 --- a/backend/windmill-git-sync/src/lib.rs +++ b/backend/windmill-git-sync/src/lib.rs @@ -118,9 +118,11 @@ pub async fn handle_deployment_metadata<'c, R: rsmq_async::RsmqConnection + Send if let Some(parent_path) = obj_parent_path.clone() { args.insert("parent_path".to_string(), json!(parent_path)); } + args.insert("workspace_id".to_string(), json!(w_id)); let message = match obj.clone() { DeployedObject::Script { path, .. } => { + args.insert("path_type".to_string(), json!("script")); if deployment_message.as_ref().is_none() || deployment_message.as_ref().is_some_and(|x| x.is_empty()) { @@ -130,6 +132,7 @@ pub async fn handle_deployment_metadata<'c, R: rsmq_async::RsmqConnection + Send } } DeployedObject::Flow { path, .. } => { + args.insert("path_type".to_string(), json!("flow")); if deployment_message.as_ref().is_none() || deployment_message.as_ref().is_some_and(|x| x.is_empty()) { @@ -139,6 +142,7 @@ pub async fn handle_deployment_metadata<'c, R: rsmq_async::RsmqConnection + Send } } DeployedObject::App { path, .. } => { + args.insert("path_type".to_string(), json!("app")); if deployment_message.as_ref().is_none() || deployment_message.as_ref().is_some_and(|x| x.is_empty()) { diff --git a/frontend/src/routes/(root)/(logged)/workspace_settings/+page.svelte b/frontend/src/routes/(root)/(logged)/workspace_settings/+page.svelte index b2ffe78f95..7eae28dc62 100644 --- a/frontend/src/routes/(root)/(logged)/workspace_settings/+page.svelte +++ b/frontend/src/routes/(root)/(logged)/workspace_settings/+page.svelte @@ -862,7 +862,7 @@ gitSyncSettings = [ ...gitSyncSettings, { - script_path: 'hub/7926/sync-script-to-git-repo-windmill', + script_path: 'hub/7927/sync-script-to-git-repo-windmill', git_repo_resource_path: '', use_individual_branch: false }