Skip to content

Commit

Permalink
nightly: use exact branch name in $BUILDVERSION_EXEC
Browse files Browse the repository at this point in the history
  • Loading branch information
dancrossnyc committed Sep 9, 2024
1 parent 5127748 commit 3e24cc6
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion tools/helios-build/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,12 @@ fn regen_illumos_sh<P: AsRef<Path>>(
smatch,$SMATCHBIN,smatch\"\n";
}
}
env += "export BUILDVERSION_EXEC=\"git describe --all --long --dirty\"\n";
env += "helios_build_buildversion_exec_function() { \n\
git describe --all --long --dirty \
--match $(git branch --show-current) --exact-match 2>/dev/null || \
git describe --all --long --dirty \n\
}\n";
env += "export BUILDVERSION_EXEC=helios_build_buildversion_exec_function\n";
env += &format!("export DMAKE_MAX_JOBS={}\n", maxjobs);
env += "export ENABLE_SMB_PRINTING='#'\n";
match relver {
Expand Down

0 comments on commit 3e24cc6

Please sign in to comment.