nightly: use exact branch name in $BUILDVERSION_EXEC

dancrossnyc · dancrossnyc · commit caf8d3514a37 · 2024-09-09T17:17:53.000Z
diff --git a/tools/helios-build/src/main.rs b/tools/helios-build/src/main.rs
@@ -599,7 +599,9 @@ fn regen_illumos_sh<P: AsRef<Path>>(
                 smatch,$SMATCHBIN,smatch\"\n";
         }
     }
-    env += "export BUILDVERSION_EXEC=\"git describe --all --long --dirty\"\n";
+    env += "export BUILDVERSION_EXEC=\
+        \"git describe --all --long --dirty \
+        --match $(git branch --show-current) --exact-match\"\n";
     env += &format!("export DMAKE_MAX_JOBS={}\n", maxjobs);
     env += "export ENABLE_SMB_PRINTING='#'\n";
     match relver {

Original file line number	Diff line number	Diff line change
`@@ -599,7 +599,9 @@ fn regen_illumos_sh<P: AsRef<Path>>(`
`599`	`599`	`smatch,$SMATCHBIN,smatch\"\n";`
`600`	`600`	`}`
`601`	`601`	`}`
`602`		`- env += "export BUILDVERSION_EXEC=\"git describe --all --long --dirty\"\n";`
	`602`	`+ env += "export BUILDVERSION_EXEC=\`
	`603`	`+ \"git describe --all --long --dirty \`
	`604`	`+ --match $(git branch --show-current) --exact-match\"\n";`
`603`	`605`	`env += &format!("export DMAKE_MAX_JOBS={}\n", maxjobs);`
`604`	`606`	`env += "export ENABLE_SMB_PRINTING='#'\n";`
`605`	`607`	`match relver {`