Skip to content

Commit 3e24cc6

Browse files
committed
nightly: use exact branch name in $BUILDVERSION_EXEC
1 parent 5127748 commit 3e24cc6

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

tools/helios-build/src/main.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,12 @@ fn regen_illumos_sh<P: AsRef<Path>>(
599599
smatch,$SMATCHBIN,smatch\"\n";
600600
}
601601
}
602-
env += "export BUILDVERSION_EXEC=\"git describe --all --long --dirty\"\n";
602+
env += "helios_build_buildversion_exec_function() { \n\
603+
git describe --all --long --dirty \
604+
--match $(git branch --show-current) --exact-match 2>/dev/null || \
605+
git describe --all --long --dirty \n\
606+
}\n";
607+
env += "export BUILDVERSION_EXEC=helios_build_buildversion_exec_function\n";
603608
env += &format!("export DMAKE_MAX_JOBS={}\n", maxjobs);
604609
env += "export ENABLE_SMB_PRINTING='#'\n";
605610
match relver {

0 commit comments

Comments
 (0)