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

chore: separate csharp publish output dir from source dir to fix flaky build (#8441)

Browse Source 
Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Ruben Fiszel
2026-03-18 18:30:09 +00:00
committed by GitHub
co-authored by Claude Opus 4.6
parent 1cfb40bdaa
commit 2171cc8e0a
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/windmill-worker/nsjail/run.csharp.config.proto
+1 -1
View File
@@ -66,7 +66,7 @@ mount {
mount {
src: "{JOB_DIR}/Main"
src: "{JOB_DIR}/out/Main"
dst: "/tmp/main"
is_bind: true
mandatory: false
backend/windmill-worker/src/csharp_executor.rs
+14 -8
View File
@@ -379,7 +379,7 @@ async fn build_cs_proj(
"--configuration",
"Release",
"-o",
job_dir,
&format!("{job_dir}/out"),
"--no-self-contained",
"-p:PublishSingleFile=true",
"-p:IncludeNativeLibrariesForSelfExtract=true",
@@ -437,9 +437,9 @@ async fn build_cs_proj(
let bin_path = format!("{}/{hash}", *CSHARP_CACHE_DIR);
#[cfg(unix)]
let target = format!("{job_dir}/Main");
let target = format!("{job_dir}/out/Main");
#[cfg(windows)]
let target = format!("{job_dir}/Main.exe");
let target = format!("{job_dir}/out/Main.exe");
match save_cache(
&bin_path,
@@ -450,7 +450,7 @@ async fn build_cs_proj(
.await
{
Err(e) => {
let em = format!("could not save {job_dir}/Main to C# cache: {e:?}",);
let em = format!("could not save {job_dir}/out/Main to C# cache: {e:?}",);
tracing::error!(em);
Ok(em)
}
@@ -527,11 +527,17 @@ pub async fn handle_csharp_job(
let cache_logs = if cache {
#[cfg(unix)]
{
let target = format!("{job_dir}/Main");
let out_dir = format!("{job_dir}/out");
std::fs::create_dir_all(&out_dir).map_err(|e| {
Error::ExecutionErr(format!(
"could not create output directory {out_dir}: {e:?}"
))
})?;
let target = format!("{out_dir}/Main");
let symlink = std::os::unix::fs::symlink(&bin_path, &target);
symlink.map_err(|e| {
Error::ExecutionErr(format!(
"could not copy cached binary from {bin_path} to {job_dir}/Main: {e:?}"
"could not copy cached binary from {bin_path} to {target}: {e:?}"
))
})?;
}
@@ -631,12 +637,12 @@ pub async fn handle_csharp_job(
start_child_process(nsjail_cmd, NSJAIL_PATH.as_str(), true).await?
} else {
#[cfg(unix)]
let compiled_executable_name = "./Main".to_string();
let compiled_executable_name = "./out/Main".to_string();
#[cfg(windows)]
let compiled_executable_name = if cache {
bin_path.to_string()
} else {
format!("{job_dir}/Main.exe")
format!("{job_dir}/out/Main.exe")
};
let mut run_csharp = build_command_with_isolation(&compiled_executable_name, &[]);