make version.localchanges match API logic (microsoft#62)

anshuman-goel · Oct 1, 2020 · dcbfe9b · dcbfe9b
1 parent bf01dbd
commit dcbfe9b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/src/agent/onefuzz-agent/build.rs b/src/agent/onefuzz-agent/build.rs
@@ -22,7 +22,7 @@ fn read_file(filename: &str) -> Result<String, Box<dyn Error>> {
     Ok(contents)
 }
 
-fn print_version(include_sha: bool) -> Result<(), Box<dyn Error>> {
+fn print_version(include_sha: bool, include_local: bool) -> Result<(), Box<dyn Error>> {
     let mut version = read_file("../../../CURRENT_VERSION")?;
     let sha = run_cmd(&["git", "rev-parse", "HEAD"])?;
 
@@ -32,7 +32,7 @@ fn print_version(include_sha: bool) -> Result<(), Box<dyn Error>> {
 
         // if we're a non-release build, check to see if git has
         // unstaged changes
-        if run_cmd(&["git", "diff", "--quiet"]).is_err() {
+        if include_local && run_cmd(&["git", "diff", "--quiet"]).is_err() {
             version.push('.');
             version.push_str("localchanges");
         }
@@ -47,10 +47,10 @@ fn print_version(include_sha: bool) -> Result<(), Box<dyn Error>> {
 fn main() -> Result<(), Box<dyn Error>> {
     // If we're built off of a tag, we accept CURRENT_VERSION as is.  Otherwise
     // modify it to indicate local build
-    let include_sha = if let Ok(val) = env::var("GITHUB_REF") {
-        !val.starts_with("refs/tags/")
+    let (include_sha, include_local_changes) = if let Ok(val) = env::var("GITHUB_REF") {
+        (!val.starts_with("refs/tags/"), false)
     } else {
-        true
+        (true, true)
     };
-    print_version(include_sha)
+    print_version(include_sha, include_local_changes)
 }
diff --git a/src/agent/onefuzz-supervisor/build.rs b/src/agent/onefuzz-supervisor/build.rs
@@ -22,7 +22,7 @@ fn read_file(filename: &str) -> Result<String, Box<dyn Error>> {
     Ok(contents)
 }
 
-fn print_version(include_sha: bool) -> Result<(), Box<dyn Error>> {
+fn print_version(include_sha: bool, include_local: bool) -> Result<(), Box<dyn Error>> {
     let mut version = read_file("../../../CURRENT_VERSION")?;
     let sha = run_cmd(&["git", "rev-parse", "HEAD"])?;
 
@@ -32,7 +32,7 @@ fn print_version(include_sha: bool) -> Result<(), Box<dyn Error>> {
 
         // if we're a non-release build, check to see if git has
         // unstaged changes
-        if run_cmd(&["git", "diff", "--quiet"]).is_err() {
+        if include_local && run_cmd(&["git", "diff", "--quiet"]).is_err() {
             version.push('.');
             version.push_str("localchanges");
         }
@@ -47,10 +47,10 @@ fn print_version(include_sha: bool) -> Result<(), Box<dyn Error>> {
 fn main() -> Result<(), Box<dyn Error>> {
     // If we're built off of a tag, we accept CURRENT_VERSION as is.  Otherwise
     // modify it to indicate local build
-    let include_sha = if let Ok(val) = env::var("GITHUB_REF") {
-        !val.starts_with("refs/tags/")
+    let (include_sha, include_local_changes) = if let Ok(val) = env::var("GITHUB_REF") {
+        (!val.starts_with("refs/tags/"), false)
     } else {
-        true
+        (true, true)
     };
-    print_version(include_sha)
+    print_version(include_sha, include_local_changes)
 }
diff --git a/src/proxy-manager/build.rs b/src/proxy-manager/build.rs
@@ -22,7 +22,7 @@ fn read_file(filename: &str) -> Result<String, Box<dyn Error>> {
     Ok(contents)
 }
 
-fn print_version(include_sha: bool) -> Result<(), Box<dyn Error>> {
+fn print_version(include_sha: bool, include_local: bool) -> Result<(), Box<dyn Error>> {
     let mut version = read_file("../../CURRENT_VERSION")?;
     let sha = run_cmd(&["git", "rev-parse", "HEAD"])?;
 
@@ -32,7 +32,7 @@ fn print_version(include_sha: bool) -> Result<(), Box<dyn Error>> {
 
         // if we're a non-release build, check to see if git has
         // unstaged changes
-        if run_cmd(&["git", "diff", "--quiet"]).is_err() {
+        if include_local && run_cmd(&["git", "diff", "--quiet"]).is_err() {
             version.push('.');
             version.push_str("localchanges");
         }
@@ -47,10 +47,10 @@ fn print_version(include_sha: bool) -> Result<(), Box<dyn Error>> {
 fn main() -> Result<(), Box<dyn Error>> {
     // If we're built off of a tag, we accept CURRENT_VERSION as is.  Otherwise
     // modify it to indicate local build
-    let include_sha = if let Ok(val) = env::var("GITHUB_REF") {
-        !val.starts_with("refs/tags/")
+    let (include_sha, include_local_changes) = if let Ok(val) = env::var("GITHUB_REF") {
+        (!val.starts_with("refs/tags/"), false)
     } else {
-        true
+        (true, true)
     };
-    print_version(include_sha)
+    print_version(include_sha, include_local_changes)
 }