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

fix custom git repository handling

Browse Source
This commit is contained in:
Ruben Fiszel
2024-01-15 21:38:54 +01:00
parent 75b034ff0b
commit f0e3f0d4e2
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/windmill-worker/src/bun_executor.rs
+5 -3
View File
@@ -307,6 +307,9 @@ pub async fn handle_bun_job(
));
}
let has_custom_config_registry =
NPM_CONFIG_REGISTRY.read().await.is_some() || BUNFIG_INSTALL_SCOPES.read().await.is_some();
if let Some(reqs) = requirements_o {
let splitted = reqs.split(BUN_LOCKB_SPLIT).collect::<Vec<&str>>();
if splitted.len() != 2 {
@@ -344,7 +347,7 @@ pub async fn handle_bun_job(
common_bun_proc_envs.clone(),
)
.await?;
if !has_trusted_deps && !nodejs_mode {
if !has_trusted_deps && !has_custom_config_registry && !nodejs_mode {
remove_dir_all(format!("{}/node_modules", job_dir)).await?;
}
}
@@ -352,8 +355,7 @@ pub async fn handle_bun_job(
// TODO: remove once bun implement a reasonable set of trusted deps
let trusted_deps = get_trusted_deps(inner_content);
let empty_trusted_deps = trusted_deps.len() == 0;
let has_custom_config_registry = NPM_CONFIG_REGISTRY.read().await.is_some()
|| BUNFIG_INSTALL_SCOPES.read().await.is_some();
// if !*DISABLE_NSJAIL || !empty_trusted_deps || has_custom_config_registry {
logs.push_str("\n\n--- BUN INSTALL ---\n");
set_logs(&logs, &job.id, &db).await;