Automate rust-analyzer promotion

This commit is contained in:
Aleksey Kladov 2020-07-07 18:38:34 +02:00
parent faa65d7856
commit a614d84ff4
2 changed files with 30 additions and 4 deletions

View file

@ -153,7 +153,17 @@ fn run_process_inner(cmd: &str, echo: bool, stdin: Option<&[u8]>) -> Result<Stri
// FIXME: some real shell lexing here // FIXME: some real shell lexing here
fn shelx(cmd: &str) -> Vec<String> { fn shelx(cmd: &str) -> Vec<String> {
cmd.split_whitespace().map(|it| it.to_string()).collect() let mut res = Vec::new();
for (string_piece, in_quotes) in cmd.split('\'').zip([false, true].iter().copied().cycle()) {
if in_quotes {
res.push(string_piece.to_string())
} else {
if !string_piece.is_empty() {
res.extend(string_piece.split_ascii_whitespace().map(|it| it.to_string()))
}
}
}
res
} }
struct Env { struct Env {

View file

@ -1,6 +1,6 @@
use crate::{ use crate::{
codegen, is_release_tag, codegen, is_release_tag,
not_bash::{date_iso, fs2, run}, not_bash::{date_iso, fs2, pushd, run},
project_root, Mode, Result, project_root, Mode, Result,
}; };
@ -76,9 +76,25 @@ pub struct PromoteCmd {
impl PromoteCmd { impl PromoteCmd {
pub fn run(self) -> Result<()> { pub fn run(self) -> Result<()> {
run!("git switch release")?; let _dir = pushd("../rust-rust-analyzer");
run!("git switch master")?;
run!("git fetch upstream")?; run!("git fetch upstream")?;
run!("git reset --hard upstream/release")?; run!("git reset --hard upstream/master")?;
run!("git submodule update --recursive")?;
let branch = format!("rust-analyzer-{}", date_iso()?);
run!("git switch -c {}", branch)?;
{
let _dir = pushd("src/tools/rust-analyzer");
run!("git fetch origin")?;
run!("git reset --hard origin/release")?;
}
run!("git add src/tools/rust-analyzer")?;
run!("git commit -m':arrow_up: rust-analyzer'")?;
if !self.dry_run {
run!("git push")?;
run!("xdg-open https://github.com/matklad/rust/pull/new/{}", branch)?;
}
Ok(()) Ok(())
} }
} }