diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-04-26 11:49:40 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2021-04-26 11:49:40 +0100 |
commit | 691c96e36a9e760d8e6f035377d03223e2f93277 (patch) | |
tree | 87930b84e6f99ff949c8cd9f60d401689cf66e03 /xtask | |
parent | 3209ddacd5d2c070f917f8733d3df9415472c47f (diff) | |
parent | 26dfb6b9d03fbee596ef891a985a3efe5cf9519e (diff) |
Merge #8661
8661: internal: make normal release after a poin release less annoying r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'xtask')
-rw-r--r-- | xtask/src/release.rs | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/xtask/src/release.rs b/xtask/src/release.rs index 22bb50467..452f351d0 100644 --- a/xtask/src/release.rs +++ b/xtask/src/release.rs | |||
@@ -10,7 +10,16 @@ impl flags::Release { | |||
10 | cmd!("git switch release").run()?; | 10 | cmd!("git switch release").run()?; |
11 | cmd!("git fetch upstream --tags --force").run()?; | 11 | cmd!("git fetch upstream --tags --force").run()?; |
12 | cmd!("git reset --hard tags/nightly").run()?; | 12 | cmd!("git reset --hard tags/nightly").run()?; |
13 | cmd!("git push").run()?; | 13 | // The `release` branch sometimes has a couple of cherry-picked |
14 | // commits for patch releases. If that's the case, just overwrite | ||
15 | // it. As we are setting `release` branch to an up-to-date `nightly` | ||
16 | // tag, this shouldn't be problematic in general. | ||
17 | // | ||
18 | // Note that, as we tag releases, we don't worry about "losing" | ||
19 | // commits -- they'll be kept alive by the tag. More generally, we | ||
20 | // don't care about historic releases all that much, it's fine even | ||
21 | // to delete old tags. | ||
22 | cmd!("git push --force").run()?; | ||
14 | } | 23 | } |
15 | codegen::docs()?; | 24 | codegen::docs()?; |
16 | 25 | ||