Add remote_topgrade_path configuration option

This commit is contained in:
Alex Hamilton
2020-07-10 02:45:15 -05:00
committed by GitHub
parent 6a1b11bc52
commit 69b9c4b24c
4 changed files with 17 additions and 5 deletions

View File

@@ -22,6 +22,9 @@
# Arguments to pass SSH when upgrading remote systems
#ssh_arguments = "-o ConnectTimeout=2"
# Path to Topgrade executable on remote machines
#remote_topgrade_path = [".cargo/bin/topgrade"]
# Arguments to pass tmux when pulling Repositories
#tmux_arguments = "-S /var/tmux.sock"

View File

@@ -166,6 +166,7 @@ pub struct ConfigFile {
disable: Option<Vec<Step>>,
ignore_failures: Option<Vec<Step>>,
remote_topgrades: Option<Vec<String>>,
remote_topgrade_path: Option<String>,
ssh_arguments: Option<String>,
git_arguments: Option<String>,
tmux_arguments: Option<String>,
@@ -466,6 +467,11 @@ impl Config {
&self.config_file.remote_topgrades
}
/// Path to Topgrade executable used for all remote hosts
pub fn remote_topgrade_path(&self) -> &str {
self.config_file.remote_topgrade_path.as_deref().unwrap_or("topgrade")
}
/// Extra SSH arguments
pub fn ssh_arguments(&self) -> &Option<String> {
&self.config_file.ssh_arguments

View File

@@ -253,10 +253,12 @@ pub fn run_composer_update(ctx: &ExecutionContext) -> Result<()> {
pub fn run_remote_topgrade(ctx: &ExecutionContext, hostname: &str) -> Result<()> {
let ssh = utils::require("ssh")?;
let topgrade = ctx.config().remote_topgrade_path();
if ctx.config().run_in_tmux() && !ctx.run_type().dry() {
#[cfg(unix)]
{
crate::tmux::run_remote_topgrade(hostname, &ssh, ctx.config().tmux_arguments())?;
crate::tmux::run_remote_topgrade(hostname, &ssh, topgrade, ctx.config().tmux_arguments())?;
Err(SkipStep.into())
}
@@ -270,7 +272,7 @@ pub fn run_remote_topgrade(ctx: &ExecutionContext, hostname: &str) -> Result<()>
}
let env = format!("TOPGRADE_PREFIX={}", hostname);
args.extend(&["env", &env, "topgrade"]);
args.extend(&["env", &env, topgrade]);
if ctx.config().yes() {
args.push("-y");

View File

@@ -104,11 +104,12 @@ pub fn run_in_tmux(args: &Option<String>) -> ! {
}
}
pub fn run_remote_topgrade(hostname: &str, ssh: &Path, tmux_args: &Option<String>) -> Result<()> {
pub fn run_remote_topgrade(hostname: &str, ssh: &Path, topgrade: &str, tmux_args: &Option<String>) -> Result<()> {
let command = format!(
"{ssh} -t {hostname} env TOPGRADE_PREFIX={hostname} TOPGRADE_KEEP_END=1 topgrade",
"{ssh} -t {hostname} env TOPGRADE_PREFIX={hostname} TOPGRADE_KEEP_END=1 {topgrade}",
ssh = ssh.display(),
hostname = hostname
hostname = hostname,
topgrade = topgrade
);
Tmux::new(tmux_args)
.build()