starred/windmill
1
0
Fork 0
mirror of https://github.com/windmill-labs/windmill.git synced 2026-08-22 00:01:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix!: git sync branch name no contains the workspace ID and the type (#3004)

Browse Source
This commit is contained in:
Guillaume Bouvignies
2024-01-15 15:23:33 +01:00
committed by GitHub
parent fb43a6c548
commit 23c1e7064d
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/windmill-git-sync/src/lib.rs
+4
View File
@@ -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())
{
frontend/src/routes/(root)/(logged)/workspace_settings/+page.svelte
+1 -1
View File
@@ -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
}