aboutsummaryrefslogtreecommitdiff
path: root/xtask
diff options
context:
space:
mode:
Diffstat (limited to 'xtask')
-rw-r--r--xtask/src/lib.rs12
-rw-r--r--xtask/src/main.rs3
2 files changed, 9 insertions, 6 deletions
diff --git a/xtask/src/lib.rs b/xtask/src/lib.rs
index d2ef2e95b..301a88324 100644
--- a/xtask/src/lib.rs
+++ b/xtask/src/lib.rs
@@ -158,11 +158,13 @@ fn rm_rf(path: &Path) -> Result<()> {
158 .with_context(|| format!("failed to remove {:?}", path)) 158 .with_context(|| format!("failed to remove {:?}", path))
159} 159}
160 160
161pub fn run_release() -> Result<()> { 161pub fn run_release(dry_run: bool) -> Result<()> {
162 run!("git switch release")?; 162 if !dry_run {
163 run!("git fetch upstream")?; 163 run!("git switch release")?;
164 run!("git reset --hard upstream/master")?; 164 run!("git fetch upstream")?;
165 run!("git push")?; 165 run!("git reset --hard upstream/master")?;
166 run!("git push")?;
167 }
166 168
167 let changelog_dir = project_root().join("../rust-analyzer.github.io/thisweek/_posts"); 169 let changelog_dir = project_root().join("../rust-analyzer.github.io/thisweek/_posts");
168 170
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index 7ca727bde..a7dffe2cc 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -93,8 +93,9 @@ FLAGS:
93 run_pre_cache() 93 run_pre_cache()
94 } 94 }
95 "release" => { 95 "release" => {
96 let dry_run = args.contains("--dry-run");
96 args.finish()?; 97 args.finish()?;
97 run_release() 98 run_release(dry_run)
98 } 99 }
99 _ => { 100 _ => {
100 eprintln!( 101 eprintln!(