|
|
|
@ -11,22 +11,27 @@ mod config;
|
|
|
|
|
const PROGRESS_FLAG: &str = "--info=progress2";
|
|
|
|
|
|
|
|
|
|
#[derive(StructOpt, Debug)]
|
|
|
|
|
#[structopt(name = "cargo-remote", bin_name = "cargo")]
|
|
|
|
|
pub struct Opts {
|
|
|
|
|
pub struct RemoteOpts {
|
|
|
|
|
#[structopt(short = "r", long = "remote", help = "Remote ssh build server")]
|
|
|
|
|
remote_name: Option<String>,
|
|
|
|
|
name: Option<String>,
|
|
|
|
|
|
|
|
|
|
#[structopt(short, long, help = "")]
|
|
|
|
|
remote_host: Option<String>,
|
|
|
|
|
host: Option<String>,
|
|
|
|
|
|
|
|
|
|
#[structopt(short, long, help = "")]
|
|
|
|
|
remote_user: Option<String>,
|
|
|
|
|
ssh_port: Option<u16>,
|
|
|
|
|
|
|
|
|
|
#[structopt(short, long, help = "")]
|
|
|
|
|
remote_ssh_port: Option<u16>,
|
|
|
|
|
temp_dir: Option<String>,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[structopt(short, long, help = "")]
|
|
|
|
|
remote_temp_dir: Option<String>,
|
|
|
|
|
#[derive(StructOpt, Debug)]
|
|
|
|
|
#[structopt(name = "cargo-remote", bin_name = "cargo")]
|
|
|
|
|
enum Opts {
|
|
|
|
|
#[structopt(name = "remote")]
|
|
|
|
|
Remote {
|
|
|
|
|
#[structopt(flatten)]
|
|
|
|
|
remote_opts: RemoteOpts,
|
|
|
|
|
|
|
|
|
|
#[structopt(
|
|
|
|
|
short = "b",
|
|
|
|
@ -88,15 +93,27 @@ pub struct Opts {
|
|
|
|
|
name = "remote options"
|
|
|
|
|
)]
|
|
|
|
|
options: Vec<String>,
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn main() {
|
|
|
|
|
simple_logger::init().unwrap();
|
|
|
|
|
|
|
|
|
|
let opts = Opts::from_args();
|
|
|
|
|
let Opts::Remote {
|
|
|
|
|
remote_opts,
|
|
|
|
|
build_env,
|
|
|
|
|
rustup_default,
|
|
|
|
|
env,
|
|
|
|
|
copy_back,
|
|
|
|
|
no_copy_lock,
|
|
|
|
|
manifest_path,
|
|
|
|
|
hidden,
|
|
|
|
|
command,
|
|
|
|
|
options,
|
|
|
|
|
} = Opts::from_args();
|
|
|
|
|
|
|
|
|
|
let mut metadata_cmd = cargo_metadata::MetadataCommand::new();
|
|
|
|
|
metadata_cmd.manifest_path(&opts.manifest_path).no_deps();
|
|
|
|
|
metadata_cmd.manifest_path(manifest_path).no_deps();
|
|
|
|
|
|
|
|
|
|
let project_metadata = metadata_cmd.exec().unwrap();
|
|
|
|
|
let project_dir = project_metadata.workspace_root;
|
|
|
|
@ -110,7 +127,7 @@ fn main() {
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
let remote = match conf.get_remote(&opts) {
|
|
|
|
|
let remote = match conf.get_remote(&remote_opts) {
|
|
|
|
|
Some(remote) => remote,
|
|
|
|
|
None => {
|
|
|
|
|
error!("No remote build server was defined (use config file or the --remote flags)");
|
|
|
|
@ -118,19 +135,7 @@ fn main() {
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
let build_server = remote.user_host();
|
|
|
|
|
|
|
|
|
|
let Opts {
|
|
|
|
|
build_env,
|
|
|
|
|
rustup_default,
|
|
|
|
|
env,
|
|
|
|
|
copy_back,
|
|
|
|
|
no_copy_lock,
|
|
|
|
|
hidden,
|
|
|
|
|
command,
|
|
|
|
|
options,
|
|
|
|
|
..
|
|
|
|
|
} = opts;
|
|
|
|
|
let build_server = remote.host;
|
|
|
|
|
|
|
|
|
|
// generate a unique build path by using the hashed project dir as folder on the remote machine
|
|
|
|
|
let mut hasher = DefaultHasher::new();
|
|
|
|
@ -144,7 +149,7 @@ fn main() {
|
|
|
|
|
.arg("-a".to_owned())
|
|
|
|
|
.arg("--delete")
|
|
|
|
|
.arg("--compress")
|
|
|
|
|
.arg(format!("-e ssh -p {}", remote.ssh_port))
|
|
|
|
|
.args(&["-e", "ssh", "-p", &remote.ssh_port.to_string()])
|
|
|
|
|
.arg("--info=progress2")
|
|
|
|
|
.arg("--exclude")
|
|
|
|
|
.arg("target");
|
|
|
|
@ -181,7 +186,7 @@ fn main() {
|
|
|
|
|
|
|
|
|
|
info!("Starting build process.");
|
|
|
|
|
let output = Command::new("ssh")
|
|
|
|
|
.arg(format!("-p {}", remote.ssh_port))
|
|
|
|
|
.args(&["-p", &remote.ssh_port.to_string()])
|
|
|
|
|
.arg("-t")
|
|
|
|
|
.arg(&build_server)
|
|
|
|
|
.arg(build_command)
|
|
|
|
@ -201,7 +206,8 @@ fn main() {
|
|
|
|
|
.arg("-a")
|
|
|
|
|
.arg("--delete")
|
|
|
|
|
.arg("--compress")
|
|
|
|
|
.arg(format!("-e ssh -p {}", remote.ssh_port))
|
|
|
|
|
.args(&["-e", "ssh", "-p", &remote.ssh_port.to_string()])
|
|
|
|
|
.arg("--info=progress2")
|
|
|
|
|
.arg("--info=progress2")
|
|
|
|
|
.arg(format!(
|
|
|
|
|
"{}:{}/target/{}",
|
|
|
|
@ -231,7 +237,8 @@ fn main() {
|
|
|
|
|
.arg("-a")
|
|
|
|
|
.arg("--delete")
|
|
|
|
|
.arg("--compress")
|
|
|
|
|
.arg(format!("-e ssh -p {}", remote.ssh_port))
|
|
|
|
|
.args(&["-e", "ssh", "-p", &remote.ssh_port.to_string()])
|
|
|
|
|
.arg("--info=progress2")
|
|
|
|
|
.arg("--info=progress2")
|
|
|
|
|
.arg(format!("{}:{}/Cargo.lock", build_server, build_path))
|
|
|
|
|
.arg(format!("{}/Cargo.lock", project_dir.to_string_lossy()))
|
|
|
|
|