blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix crash when CI_COMMIT=HEAD (#9994) 

automerge
This commit is contained in:
Michael Vines 2020-05-11 22:49:29 -07:00 committed by GitHub
parent 59de1b3b62
commit 28d1f7c5e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
version/src/lib.rs
View File

@ -11,14 +11,22 @@ pub struct Version {
commit: Option<u32>, // first 4 bytes of the sha1 commit hash commit: Option<u32>, // first 4 bytes of the sha1 commit hash
} }
fn compute_commit(sha1: Option<&'static str>) -> Option<u32> {
let sha1 = sha1?;
if sha1.len() < 8 {
None
} else {
u32::from_str_radix(&sha1[..8], 16).ok()
}
}
impl Default for Version { impl Default for Version {
fn default() -> Self { fn default() -> Self {
Self { Self {
major: env!("CARGO_PKG_VERSION_MAJOR").parse().unwrap(), major: env!("CARGO_PKG_VERSION_MAJOR").parse().unwrap(),
minor: env!("CARGO_PKG_VERSION_MINOR").parse().unwrap(), minor: env!("CARGO_PKG_VERSION_MINOR").parse().unwrap(),
patch: env!("CARGO_PKG_VERSION_PATCH").parse().unwrap(), patch: env!("CARGO_PKG_VERSION_PATCH").parse().unwrap(),
commit: option_env!("CI_COMMIT") commit: compute_commit(option_env!("CI_COMMIT")),
.map(|sha1| u32::from_str_radix(&sha1[..8], 16).unwrap()),
} }
} }
} }
@ -47,3 +55,16 @@ macro_rules! version {
&*format!("{}", $crate::Version::default()) &*format!("{}", $crate::Version::default())
}; };
} }
#[cfg(test)]
mod test {
use super::*;
#[test]
fn test_compute_commit() {
assert_eq!(compute_commit(None), None);
assert_eq!(compute_commit(Some("1234567890")), Some(0x12345678));
assert_eq!(compute_commit(Some("HEAD")), None);
assert_eq!(compute_commit(Some("garbagein")), None);
}
}