aboutsummaryrefslogtreecommitdiff
path: root/xtask/src/lib.rs
diff options
context:
space:
mode:
Diffstat (limited to 'xtask/src/lib.rs')
-rw-r--r--xtask/src/lib.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/xtask/src/lib.rs b/xtask/src/lib.rs
index 4f01f84fb..9d087daa2 100644
--- a/xtask/src/lib.rs
+++ b/xtask/src/lib.rs
@@ -21,7 +21,7 @@ use walkdir::{DirEntry, WalkDir};
21 21
22use crate::{ 22use crate::{
23 codegen::Mode, 23 codegen::Mode,
24 not_bash::{fs2, pushd, rm_rf, run}, 24 not_bash::{date_iso, fs2, pushd, rm_rf, run},
25}; 25};
26 26
27pub use anyhow::Result; 27pub use anyhow::Result;
@@ -172,15 +172,15 @@ pub fn run_pre_cache() -> Result<()> {
172pub fn run_release(dry_run: bool) -> Result<()> { 172pub fn run_release(dry_run: bool) -> Result<()> {
173 if !dry_run { 173 if !dry_run {
174 run!("git switch release")?; 174 run!("git switch release")?;
175 run!("git fetch upstream")?; 175 run!("git fetch upstream --tags --force")?;
176 run!("git reset --hard upstream/master")?; 176 run!("git reset --hard tags/nightly")?;
177 run!("git push")?; 177 run!("git push")?;
178 } 178 }
179 179
180 let website_root = project_root().join("../rust-analyzer.github.io"); 180 let website_root = project_root().join("../rust-analyzer.github.io");
181 let changelog_dir = website_root.join("./thisweek/_posts"); 181 let changelog_dir = website_root.join("./thisweek/_posts");
182 182
183 let today = run!("date --iso")?; 183 let today = date_iso()?;
184 let commit = run!("git rev-parse HEAD")?; 184 let commit = run!("git rev-parse HEAD")?;
185 let changelog_n = fs2::read_dir(changelog_dir.as_path())?.count(); 185 let changelog_n = fs2::read_dir(changelog_dir.as_path())?.count();
186 186