mirror of
https://github.com/DarkFlippers/unleashed-firmware.git
synced 2025-12-12 20:49:49 +04:00
Fix merge issues
This commit is contained in:
@@ -35,8 +35,6 @@ class GitVersion:
|
|||||||
or "unknown"
|
or "unknown"
|
||||||
)
|
)
|
||||||
|
|
||||||
branch_num = self._exec_git("rev-list --count HEAD") or "n/a"
|
|
||||||
|
|
||||||
version = (
|
version = (
|
||||||
os.environ.get("DIST_SUFFIX", None)
|
os.environ.get("DIST_SUFFIX", None)
|
||||||
or "unknown"
|
or "unknown"
|
||||||
@@ -58,7 +56,6 @@ class GitVersion:
|
|||||||
return {
|
return {
|
||||||
"GIT_COMMIT": commit,
|
"GIT_COMMIT": commit,
|
||||||
"GIT_BRANCH": branch,
|
"GIT_BRANCH": branch,
|
||||||
"GIT_BRANCH_NUM": branch_num,
|
|
||||||
"FURI_CUSTOM_FLIPPER_NAME": custom_fz_name,
|
"FURI_CUSTOM_FLIPPER_NAME": custom_fz_name,
|
||||||
"VERSION": version,
|
"VERSION": version,
|
||||||
"BUILD_DIRTY": dirty and 1 or 0,
|
"BUILD_DIRTY": dirty and 1 or 0,
|
||||||
@@ -67,7 +64,6 @@ class GitVersion:
|
|||||||
return {
|
return {
|
||||||
"GIT_COMMIT": commit,
|
"GIT_COMMIT": commit,
|
||||||
"GIT_BRANCH": branch,
|
"GIT_BRANCH": branch,
|
||||||
"GIT_BRANCH_NUM": branch_num,
|
|
||||||
"VERSION": version,
|
"VERSION": version,
|
||||||
"BUILD_DIRTY": dirty and 1 or 0,
|
"BUILD_DIRTY": dirty and 1 or 0,
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user