patrick/OpenDTU
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Embed current branch into building process

Browse Source
This commit is contained in:
Thomas Basler 2024-09-25 21:46:38 +02:00
parent 0847f021f1
commit 155735c828
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/__compiled_constants.h
View File

@ -5,4 +5,5 @@
extern const char *__COMPILED_GIT_HASH__; extern const char *__COMPILED_GIT_HASH__;
extern const char *__COMPILED_GIT_BRANCH__;
// extern const char *__COMPILED_DATE_TIME_UTC_STR__; // extern const char *__COMPILED_DATE_TIME_UTC_STR__;

13
pio-scripts/auto_firmware_version.py
View File

@ -36,9 +36,20 @@ def get_build_version():
return build_version return build_version
def get_build_branch():
try:
branch_name = porcelain.active_branch('.').decode('utf-8') # '.' refers to the repository root dir
except Exception as err:
branch_name = "master"
print("Firmware Branch: " + branch_name)
return branch_name
def get_firmware_specifier_build_flag(): def get_firmware_specifier_build_flag():
build_version = get_build_version() build_version = get_build_version()
build_flag = "-D AUTO_GIT_HASH=\\\"" + build_version + "\\\"" build_flag = "-D AUTO_GIT_HASH=\\\"" + build_version + "\\\""
build_branch = get_build_branch()
build_flag += " -D AUTO_GIT_BRANCH=\\\"" + branch_name + "\\\""
return (build_flag) return (build_flag)
@ -64,6 +75,8 @@ def do_main():
if 1: if 1:
# Add the description of the current git revision # Add the description of the current git revision
lines += 'const char *__COMPILED_GIT_HASH__ = "%s";\n' % (get_build_version()) lines += 'const char *__COMPILED_GIT_HASH__ = "%s";\n' % (get_build_version())
# ... and git branch
lines += 'const char *__COMPILED_GIT_BRANCH__ = "%s";\n' % (get_build_branch())
updateFileIfChanged(targetfile, bytes(lines, "utf-8")) updateFileIfChanged(targetfile, bytes(lines, "utf-8"))