diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-04-13 07:22:09 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2021-04-13 07:22:09 +0100 |
commit | 15d3b6c577ad370302f9e82f0df4d001300f9b17 (patch) | |
tree | 688189f4fafc18b2a00d63f7828d437d926bae0e | |
parent | 27e80e943824855c5913f20a776b3a5fa959e942 (diff) | |
parent | 3b964c0c81e7b8fa0c3ce6425e9ac2d0553bda2f (diff) |
Merge #8496
8496: Exclude nightly tag from git describe to fix version string r=lnicola a=lnicola
Otherwise if we run `git describe` on the release day we pick up the `nightly` tag from the previous release.
changelog fix
bors r+
Co-authored-by: Laurențiu Nicola <[email protected]>
-rw-r--r-- | crates/rust-analyzer/build.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crates/rust-analyzer/build.rs b/crates/rust-analyzer/build.rs index 999dc5928..13b903891 100644 --- a/crates/rust-analyzer/build.rs +++ b/crates/rust-analyzer/build.rs | |||
@@ -39,7 +39,8 @@ fn set_rerun() { | |||
39 | } | 39 | } |
40 | 40 | ||
41 | fn rev() -> Option<String> { | 41 | fn rev() -> Option<String> { |
42 | let output = Command::new("git").args(&["describe", "--tags"]).output().ok()?; | 42 | let output = |
43 | Command::new("git").args(&["describe", "--tags", "--exclude", "nightly"]).output().ok()?; | ||
43 | let stdout = String::from_utf8(output.stdout).ok()?; | 44 | let stdout = String::from_utf8(output.stdout).ok()?; |
44 | Some(stdout) | 45 | Some(stdout) |
45 | } | 46 | } |