remote ssh: Fix asset embedding in cross-compilation (#19180)

This fixes the panic from the settings file not being embedded.


Release Notes:

- N/A

---------

Co-authored-by: Bennet <bennet@zed.dev>
This commit is contained in:
Thorsten Ball 2024-10-14 14:13:06 +02:00 committed by GitHub
parent f2337bbed1
commit 71a878aa39
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 9 additions and 1 deletions

1
Cargo.lock generated
View file

@ -9153,6 +9153,7 @@ dependencies = [
"project", "project",
"remote", "remote",
"rpc", "rpc",
"rust-embed",
"serde", "serde",
"serde_json", "serde_json",
"settings", "settings",

View file

@ -461,7 +461,7 @@ impl SshClientDelegate {
} else if let Some(triple) = platform.triple() { } else if let Some(triple) = platform.triple() {
smol::fs::create_dir_all("target/remote-server").await?; smol::fs::create_dir_all("target/remote-server").await?;
self.update_status(Some("Installing cross.rs"), cx); self.update_status(Some("Installing cross.rs for cross-compilation"), cx);
log::info!("installing cross"); log::info!("installing cross");
run_cmd(Command::new("cargo").args([ run_cmd(Command::new("cargo").args([
"install", "install",
@ -485,6 +485,8 @@ impl SshClientDelegate {
"build", "build",
"--package", "--package",
"remote_server", "remote_server",
"--features",
"debug-embed",
"--target-dir", "--target-dir",
"target/remote_server", "target/remote_server",
"--target", "--target",

View file

@ -18,6 +18,7 @@ name = "remote_server"
[features] [features]
default = [] default = []
debug-embed = ["dep:rust-embed"]
test-support = ["fs/test-support"] test-support = ["fs/test-support"]
[dependencies] [dependencies]
@ -36,6 +37,7 @@ node_runtime.workspace = true
project.workspace = true project.workspace = true
remote.workspace = true remote.workspace = true
rpc.workspace = true rpc.workspace = true
rust-embed = { workspace = true, optional = true, features = ["debug-embed"] }
serde.workspace = true serde.workspace = true
serde_json.workspace = true serde_json.workspace = true
settings.workspace = true settings.workspace = true
@ -61,3 +63,6 @@ serde_json.workspace = true
[build-dependencies] [build-dependencies]
cargo_toml.workspace = true cargo_toml.workspace = true
toml.workspace = true toml.workspace = true
[package.metadata.cargo-machete]
ignored = ["rust-embed"]