1
0
Fork 1
Spiegel von https://github.com/dani-garcia/vaultwarden.git synchronisiert 2024-11-25 05:40:29 +01:00

Merge pull request #3651 from tessus/fix/branch-on-HEAD

fix version when compiled at a specific commit
Dieser Commit ist enthalten in:
Daniel García 2023-07-05 18:45:08 +02:00 committet von GitHub
Commit 4826ddca4c
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 4AEE18F83AFDEB23

Datei anzeigen

@ -72,7 +72,7 @@ fn version_from_git_info() -> Result<String, std::io::Error> {
// Combined version // Combined version
if let Some(exact) = exact_tag { if let Some(exact) = exact_tag {
Ok(exact) Ok(exact)
} else if &branch != "main" && &branch != "master" { } else if &branch != "main" && &branch != "master" && &branch != "HEAD" {
Ok(format!("{last_tag}-{rev_short} ({branch})")) Ok(format!("{last_tag}-{rev_short} ({branch})"))
} else { } else {
Ok(format!("{last_tag}-{rev_short}")) Ok(format!("{last_tag}-{rev_short}"))