From 99f80d76933865154d3cb88786e9e90275f93523 Mon Sep 17 00:00:00 2001
From: Andres Suarez <zertosh@gmail.com>
Date: Wed, 4 Feb 2026 04:15:21 -0500
Subject: [PATCH] remote: Fix build_remote_server_from_source compression on
 unix (#48319)

When using gzip, the output path's extension becomes `.gz`.

Release Notes:

- N/A
---
 crates/remote/src/transport.rs | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/crates/remote/src/transport.rs b/crates/remote/src/transport.rs
index fcbfdcbde75fe2d0bab1cd8f6bc74d86bfa0b98b..e4707dee815cf86e021c8844a2dfd338710d56b0 100644
--- a/crates/remote/src/transport.rs
+++ b/crates/remote/src/transport.rs
@@ -346,20 +346,21 @@ async fn build_remote_server_from_source(
         delegate.set_status(Some("Compressing binary"), cx);
 
         #[cfg(not(target_os = "windows"))]
-        {
-            run_cmd(new_smol_command("gzip").args(["-f", &bin_path.to_string_lossy()])).await?;
-        }
+        let archive_path = {
+            run_cmd(new_smol_command("gzip").arg("-f").arg(&bin_path)).await?;
+            bin_path.with_extension("gz")
+        };
 
         #[cfg(target_os = "windows")]
-        {
-            let zip_path = format!("target/remote_server/{}/debug/remote_server.zip", triple);
+        let archive_path = {
+            let zip_path = bin_path.with_extension("zip");
             if smol::fs::metadata(&zip_path).await.is_ok() {
                 smol::fs::remove_file(&zip_path).await?;
             }
             let compress_command = format!(
                 "Compress-Archive -Path '{}' -DestinationPath '{}' -Force",
-                bin_path.to_string_lossy(),
-                zip_path
+                bin_path.display(),
+                zip_path.display(),
             );
             run_cmd(new_smol_command("powershell.exe").args([
                 "-NoProfile",
@@ -367,10 +368,9 @@ async fn build_remote_server_from_source(
                 &compress_command,
             ]))
             .await?;
-        }
+            zip_path
+        };
 
-        let mut archive_path = bin_path;
-        archive_path.set_extension("zip");
         std::env::current_dir()?.join(archive_path)
     } else {
         bin_path