mirror of
https://github.com/rust-lang/rust-analyzer
synced 2024-12-25 04:23:25 +00:00
Refactor
This commit is contained in:
parent
97ea2dfc4b
commit
cbc5eb8738
2 changed files with 62 additions and 54 deletions
|
@ -17,7 +17,7 @@ use xtask::{
|
|||
install::{ClientOpt, InstallCmd, ServerOpt},
|
||||
not_bash::pushd,
|
||||
pre_commit, project_root,
|
||||
release::run_release,
|
||||
release::ReleaseCmd,
|
||||
run_clippy, run_fuzzer, run_pre_cache, run_rustfmt, Result,
|
||||
};
|
||||
|
||||
|
@ -103,7 +103,7 @@ FLAGS:
|
|||
"release" => {
|
||||
let dry_run = args.contains("--dry-run");
|
||||
args.finish()?;
|
||||
run_release(dry_run)
|
||||
ReleaseCmd { dry_run }.run()
|
||||
}
|
||||
"dist" => {
|
||||
let nightly = args.contains("--nightly");
|
||||
|
|
|
@ -4,8 +4,13 @@ use crate::{
|
|||
project_root, Mode, Result,
|
||||
};
|
||||
|
||||
pub fn run_release(dry_run: bool) -> Result<()> {
|
||||
if !dry_run {
|
||||
pub struct ReleaseCmd {
|
||||
pub dry_run: bool,
|
||||
}
|
||||
|
||||
impl ReleaseCmd {
|
||||
pub fn run(self) -> Result<()> {
|
||||
if !self.dry_run {
|
||||
run!("git switch release")?;
|
||||
run!("git fetch upstream --tags --force")?;
|
||||
run!("git reset --hard tags/nightly")?;
|
||||
|
@ -53,7 +58,10 @@ Release: release:{}[]
|
|||
let tags = run!("git tag --list"; echo = false)?;
|
||||
let prev_tag = tags.lines().filter(|line| is_release_tag(line)).last().unwrap();
|
||||
|
||||
println!("\n git log {}..HEAD --merges --reverse", prev_tag);
|
||||
let git_log = run!("git log {}..HEAD --merges --reverse", prev_tag; echo = false)?;
|
||||
let git_log_dst = website_root.join("git.log");
|
||||
fs2::write(git_log_dst, &git_log)?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue