Spiegel von
https://github.com/dani-garcia/vaultwarden.git
synchronisiert 2024-08-18 09:55:25 +02:00
fix version when compiled at a specific commit
When a specific commit is checked out from the main branch, the vaultwarden version is reported as `vaultwarden x.y.z-githash (HEAD)`. This is a problem, because the admin interface reports this as a version from a branch called HEAD, while in reality the commit was from the main branch.
Dieser Commit ist enthalten in:
Ursprung
a6cfdddfd8
Commit
2b32b6f78c
1 geänderte Dateien mit 1 neuen und 1 gelöschten Zeilen
2
build.rs
2
build.rs
|
@ -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}"))
|
||||||
|
|
Laden …
In neuem Issue referenzieren