Compare commits

...

3 Commits

Author SHA1 Message Date
KonradRudin 31ced4647c Update src/lib/version/px_update_git_header.py 2024-08-27 16:41:12 +02:00
KonradRudin 516414ee3b Apply suggestions from code review
Co-authored-by: Daniel Agar <daniel@agar.ca>
2024-08-27 16:40:11 +02:00
Konrad 0fee107e79 git_tag: make sure to search for last valid tage beginning with vx.y.z only 2024-08-27 13:21:43 +02:00
3 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -113,7 +113,7 @@ include(px4_parse_function_args)
include(px4_git)
execute_process(
COMMAND git describe --exclude ext/* --tags --match "v[0-9]*"
COMMAND git describe --exclude ext/* --match v[0-9]*.[0-9]*.[0-9]* --tags
OUTPUT_VARIABLE PX4_GIT_TAG
OUTPUT_STRIP_TRAILING_WHITESPACE
RESULTS_VARIABLE GIT_DESCRIBE_RESULT
+1 -1
View File
@@ -65,7 +65,7 @@ def get_version():
if os.path.isdir(os.path.join(px4_dir, '.git')):
# If inside a clone PX4 Firmware repository, get version from "git describe"
cmd = 'git describe --exclude ext/* --abbrev=0 --tags'
cmd = 'git describe --exclude ext/* --match v[0-9]*.[0-9]*.[0-9]* --abbrev=0 --tags'
try:
version = subprocess.check_output(
cmd, cwd=px4_dir, shell=True).decode().strip()
+1 -1
View File
@@ -40,7 +40,7 @@ header = """
if args.git_tag:
git_tag = args.git_tag
else:
git_describe_cmd = 'git describe --exclude ext/* --always --tags --dirty'
git_describe_cmd = 'git describe --exclude ext/* --match v[0-9]*.[0-9]*.[0-9]* --tags --dirty'
git_tag = subprocess.check_output(git_describe_cmd.split(),
stderr=subprocess.STDOUT).decode('utf-8').strip()