geforkt von mirrored/vaultwarden
Fix branch name
Dieser Commit ist enthalten in:
Ursprung
3da44a8d30
Commit
2b4dd6f137
2 geänderte Dateien mit 2 neuen und 2 gelöschten Zeilen
2
build.rs
2
build.rs
|
@ -58,7 +58,7 @@ fn read_git_info() -> Result<(), std::io::Error> {
|
||||||
// Combined version
|
// Combined version
|
||||||
let version = if let Some(exact) = exact_tag {
|
let version = if let Some(exact) = exact_tag {
|
||||||
exact
|
exact
|
||||||
} else if &branch != "master" {
|
} else if &branch != "main" && &branch != "master" {
|
||||||
format!("{}-{} ({})", last_tag, rev_short, branch)
|
format!("{}-{} ({})", last_tag, rev_short, branch)
|
||||||
} else {
|
} else {
|
||||||
format!("{}-{}", last_tag, rev_short)
|
format!("{}-{}", last_tag, rev_short)
|
||||||
|
|
|
@ -522,7 +522,7 @@ fn diagnostics(_token: AdminToken, ip_header: IpHeader, conn: DbConn) -> ApiResu
|
||||||
Ok(r) => r.tag_name,
|
Ok(r) => r.tag_name,
|
||||||
_ => "-".to_string(),
|
_ => "-".to_string(),
|
||||||
},
|
},
|
||||||
match get_github_api::<GitCommit>("https://api.github.com/repos/dani-garcia/vaultwarden/commits/master") {
|
match get_github_api::<GitCommit>("https://api.github.com/repos/dani-garcia/vaultwarden/commits/main") {
|
||||||
Ok(mut c) => {
|
Ok(mut c) => {
|
||||||
c.sha.truncate(8);
|
c.sha.truncate(8);
|
||||||
c.sha
|
c.sha
|
||||||
|
|
Laden …
In neuem Issue referenzieren