sv/IronOS
1
0
Fork 0
forked from me/IronOS
Code Pull Requests Activity

Update tagging for detached commit case & update docs (#1783)

Browse Source 
make_translation.py: update tagging for detached commit case & update docs
This commit is contained in:
Ivan Zorin
2023-08-07 02:05:56 +03:00
committed by GitHub
parent 8b90666f30
commit 15ab87f3bc
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/DebugMenu.md
View File

@@ -22,6 +22,7 @@ There is a static line on top which is presented on every sub-screen and reflect
- T - git-related release **t**ag but version is not vXX.YY ! - T - git-related release **t**ag but version is not vXX.YY !
- D - git-related **d**ev branch - D - git-related **d**ev branch
- B - git-related custom **b**ranch - B - git-related custom **b**ranch
- E - git-related from d**e**tached commit
- G - neither above but **g**it-related - G - neither above but **g**it-related
- C - build from github **C**I during _pull request_ - C - build from github **C**I during _pull request_
- H - build outside of a git tree (i.e. release tarball or **h**omebrew customization without git) - H - build outside of a git tree (i.e. release tarball or **h**omebrew customization without git)

10
Translations/make_translation.py
View File

@@ -1278,8 +1278,14 @@ def get_version_suffix(ver) -> str:
sha_id = f"{subprocess.check_output(['git', 'rev-parse', '--short=8', 'HEAD']).strip().decode('ascii').upper()}" sha_id = f"{subprocess.check_output(['git', 'rev-parse', '--short=8', 'HEAD']).strip().decode('ascii').upper()}"
## - if the exact commit relates to tag, then this command should return one-line tag name: ## - if the exact commit relates to tag, then this command should return one-line tag name:
tag = f"{subprocess.check_output(['git', 'tag', '--points-at', '%s' % sha_id]).strip().decode('ascii')}" tag = f"{subprocess.check_output(['git', 'tag', '--points-at', '%s' % sha_id]).strip().decode('ascii')}"
## - get short "traditional" branch name (as in `git branch` for that one with asterisk): if (
branch = f"{subprocess.check_output(['git', 'symbolic-ref', '--short', 'HEAD']).strip().decode('ascii')}" f"{subprocess.check_output(['git', 'rev-parse', '--symbolic-full-name', '--short', 'HEAD']).strip().decode('ascii')}"
== "HEAD"
):
return "E" + "." + sha_id
else:
## - get short "traditional" branch name (as in `git branch` for that one with asterisk):
branch = f"{subprocess.check_output(['git', 'symbolic-ref', '--short', 'HEAD']).strip().decode('ascii')}"
if tag and "" != tag: if tag and "" != tag:
# _Speculate_ on tag that it's Release... # _Speculate_ on tag that it's Release...
if ver == tag: if ver == tag: