diff options
| author | QMK Bot <hello@qmk.fm> | 2022-03-18 16:02:57 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-03-18 16:02:57 +0000 |
| commit | 3a08deb7fe0d83ca17a8a584fd68c98a018a1c17 (patch) | |
| tree | 7397bd53ca9dad96498fc712bc8353af3fc2a1e4 /lib/python/qmk/cli/generate | |
| parent | bffb209eeeab1cc4d070217aa1bc65b6834cf42c (diff) | |
| parent | ed773ab73cab83b842dc62ff94ffb337ec66a5f3 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'lib/python/qmk/cli/generate')
| -rw-r--r-- | lib/python/qmk/cli/generate/version_h.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/python/qmk/cli/generate/version_h.py b/lib/python/qmk/cli/generate/version_h.py index be9646748e..a75702c529 100644 --- a/lib/python/qmk/cli/generate/version_h.py +++ b/lib/python/qmk/cli/generate/version_h.py @@ -6,7 +6,7 @@ from milc import cli from qmk.path import normpath from qmk.commands import dump_lines -from qmk.commands import get_git_version +from qmk.git import git_get_version from qmk.constants import GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE TIME_FMT = '%Y-%m-%d-%H:%M:%S' @@ -33,9 +33,9 @@ def generate_version_h(cli): chibios_version = "NA" chibios_contrib_version = "NA" else: - git_version = get_git_version(current_time) - chibios_version = get_git_version(current_time, "chibios", "os") - chibios_contrib_version = get_git_version(current_time, "chibios-contrib", "os") + git_version = git_get_version() or current_time + chibios_version = git_get_version("chibios", "os") or current_time + chibios_contrib_version = git_get_version("chibios-contrib", "os") or current_time # Build the version.h file. version_h_lines = [GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE, '#pragma once'] |