diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-04-07 10:47:40 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-04-07 10:47:40 +0100 |
commit | c8c6cb8a6bd0e2987f2d6d765436fb5d53a34616 (patch) | |
tree | ebd34041ce61f17c5a9411f25148701179c5e3f4 | |
parent | 9c482f4a215ecb98e038e3ea07d9ef9ec3c481f5 (diff) | |
parent | 372e684f6e8fa33e3c7d7de9d6669dfa6da4e818 (diff) |
Merge #3875
3875: When making a release, just promote the latest nightly r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
-rw-r--r-- | xtask/src/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xtask/src/lib.rs b/xtask/src/lib.rs index 4f01f84fb..0b8243f62 100644 --- a/xtask/src/lib.rs +++ b/xtask/src/lib.rs | |||
@@ -172,8 +172,8 @@ pub fn run_pre_cache() -> Result<()> { | |||
172 | pub fn run_release(dry_run: bool) -> Result<()> { | 172 | pub 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 | ||