Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 04:53:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Refactor

Browse source
This commit is contained in:
Aleksey Kladov 2020-06-08 14:00:30 +02:00
parent 97ea2dfc4b
commit cbc5eb8738
2 changed files with 62 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
xtask/src/main.rs
View file

@ -17,7 +17,7 @@ use xtask::{
install::{ClientOpt, InstallCmd, ServerOpt}, install::{ClientOpt, InstallCmd, ServerOpt},
not_bash::pushd, not_bash::pushd,
pre_commit, project_root, pre_commit, project_root,
release::run_release, release::ReleaseCmd,
run_clippy, run_fuzzer, run_pre_cache, run_rustfmt, Result, run_clippy, run_fuzzer, run_pre_cache, run_rustfmt, Result,
}; };
@ -103,7 +103,7 @@ FLAGS:
"release" => { "release" => {
let dry_run = args.contains("--dry-run"); let dry_run = args.contains("--dry-run");
args.finish()?; args.finish()?;
run_release(dry_run) ReleaseCmd { dry_run }.run()
} }
"dist" => { "dist" => {
let nightly = args.contains("--nightly"); let nightly = args.contains("--nightly");

34
xtask/src/release.rs
View file

@ -4,8 +4,13 @@ use crate::{
project_root, Mode, Result, project_root, Mode, Result,
}; };
pub fn run_release(dry_run: bool) -> Result<()> { pub struct ReleaseCmd {
if !dry_run { pub dry_run: bool,
}
impl ReleaseCmd {
pub fn run(self) -> Result<()> {
if !self.dry_run {
run!("git switch release")?; run!("git switch release")?;
run!("git fetch upstream --tags --force")?; run!("git fetch upstream --tags --force")?;
run!("git reset --hard tags/nightly")?; run!("git reset --hard tags/nightly")?;
@ -23,21 +28,21 @@ pub fn run_release(dry_run: bool) -> Result<()> {
let contents = format!( let contents = format!(
"\ "\
= Changelog #{} = Changelog #{}
:sectanchors: :sectanchors:
:page-layout: post :page-layout: post
Commit: commit:{}[] + Commit: commit:{}[] +
Release: release:{}[] Release: release:{}[]
== New Features == New Features
* pr:[] . * pr:[] .
== Fixes == Fixes
== Internal Improvements == Internal Improvements
", ",
changelog_n, commit, today changelog_n, commit, today
); );
@ -53,7 +58,10 @@ Release: release:{}[]
let tags = run!("git tag --list"; echo = false)?; let tags = run!("git tag --list"; echo = false)?;
let prev_tag = tags.lines().filter(|line| is_release_tag(line)).last().unwrap(); 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(()) Ok(())
}
} }