masq
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

`qmk doctor`: display qmk_firmware version tag (#16155)

This commit is contained in:
Ryan 2022-02-02 15:31:42 +11:00 committed by GitHub
parent 16ad8c0159
commit c9f88d7c67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/python/qmk/cli/doctor/main.py
View File

@ -11,7 +11,7 @@ from milc.questions import yesno
from qmk import submodules from qmk import submodules
from qmk.constants import QMK_FIRMWARE, QMK_FIRMWARE_UPSTREAM from qmk.constants import QMK_FIRMWARE, QMK_FIRMWARE_UPSTREAM
from .check import CheckStatus, check_binaries, check_binary_versions, check_submodules from .check import CheckStatus, check_binaries, check_binary_versions, check_submodules
from qmk.commands import git_check_repo, git_get_branch, git_is_dirty, git_get_remotes, git_check_deviation, in_virtualenv from qmk.commands import git_check_repo, git_get_branch, git_get_tag, git_is_dirty, git_get_remotes, git_check_deviation, in_virtualenv
def os_tests(): def os_tests():
@ -47,6 +47,11 @@ def git_tests():
git_branch = git_get_branch() git_branch = git_get_branch()
if git_branch: if git_branch:
cli.log.info('Git branch: %s', git_branch) cli.log.info('Git branch: %s', git_branch)
repo_version = git_get_tag()
if repo_version:
cli.log.info('Repo version: %s', repo_version)
git_dirty = git_is_dirty() git_dirty = git_is_dirty()
if git_dirty: if git_dirty:
cli.log.warning('{fg_yellow}Git has unstashed/uncommitted changes.') cli.log.warning('{fg_yellow}Git has unstashed/uncommitted changes.')

8
lib/python/qmk/commands.py
View File

@ -295,6 +295,14 @@ def git_get_branch():
return git_branch.stdout.strip() return git_branch.stdout.strip()
def git_get_tag():
"""Returns the current tag for a repo, or None.
"""
git_tag = cli.run(['git', 'describe', '--abbrev=0', '--tags'])
if git_tag.returncode == 0:
return git_tag.stdout.strip()
def git_is_dirty(): def git_is_dirty():
"""Returns 1 if repo is dirty, or 0 if clean """Returns 1 if repo is dirty, or 0 if clean
""" """