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

View file

@ -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");

View file

@ -4,56 +4,64 @@ use crate::{
project_root, Mode, Result,
};
pub fn run_release(dry_run: bool) -> Result<()> {
if !dry_run {
run!("git switch release")?;
run!("git fetch upstream --tags --force")?;
run!("git reset --hard tags/nightly")?;
run!("git push")?;
}
codegen::generate_assists_docs(Mode::Overwrite)?;
codegen::generate_feature_docs(Mode::Overwrite)?;
let website_root = project_root().join("../rust-analyzer.github.io");
let changelog_dir = website_root.join("./thisweek/_posts");
let today = date_iso()?;
let commit = run!("git rev-parse HEAD")?;
let changelog_n = fs2::read_dir(changelog_dir.as_path())?.count();
let contents = format!(
"\
= Changelog #{}
:sectanchors:
:page-layout: post
Commit: commit:{}[] +
Release: release:{}[]
== New Features
* pr:[] .
== Fixes
== Internal Improvements
",
changelog_n, commit, today
);
let path = changelog_dir.join(format!("{}-changelog-{}.adoc", today, changelog_n));
fs2::write(&path, &contents)?;
for &adoc in ["manual.adoc", "generated_features.adoc", "generated_assists.adoc"].iter() {
let src = project_root().join("./docs/user/").join(adoc);
let dst = website_root.join(adoc);
fs2::copy(src, dst)?;
}
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);
Ok(())
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")?;
run!("git push")?;
}
codegen::generate_assists_docs(Mode::Overwrite)?;
codegen::generate_feature_docs(Mode::Overwrite)?;
let website_root = project_root().join("../rust-analyzer.github.io");
let changelog_dir = website_root.join("./thisweek/_posts");
let today = date_iso()?;
let commit = run!("git rev-parse HEAD")?;
let changelog_n = fs2::read_dir(changelog_dir.as_path())?.count();
let contents = format!(
"\
= Changelog #{}
:sectanchors:
:page-layout: post
Commit: commit:{}[] +
Release: release:{}[]
== New Features
* pr:[] .
== Fixes
== Internal Improvements
",
changelog_n, commit, today
);
let path = changelog_dir.join(format!("{}-changelog-{}.adoc", today, changelog_n));
fs2::write(&path, &contents)?;
for &adoc in ["manual.adoc", "generated_features.adoc", "generated_assists.adoc"].iter() {
let src = project_root().join("./docs/user/").join(adoc);
let dst = website_root.join(adoc);
fs2::copy(src, dst)?;
}
let tags = run!("git tag --list"; echo = false)?;
let prev_tag = tags.lines().filter(|line| is_release_tag(line)).last().unwrap();
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(())
}
}