From d6db06faf3fc657e2ef03bc8f1a237bd6fdf57f7 Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Wed, 23 Mar 2022 11:56:56 -0700 Subject: [PATCH] px_update_git_header:Extract latest release tag --- src/lib/version/px_update_git_header.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/version/px_update_git_header.py b/src/lib/version/px_update_git_header.py index ac20036f31..3f47da7e7c 100755 --- a/src/lib/version/px_update_git_header.py +++ b/src/lib/version/px_update_git_header.py @@ -148,8 +148,9 @@ if (os.path.exists('src/modules/mavlink/mavlink/.git')): # NuttX if (os.path.exists('platforms/nuttx/NuttX/nuttx/.git')): - nuttx_git_tag = subprocess.check_output('git describe --always --tags --match nuttx-* --dirty'.split(), - cwd='platforms/nuttx/NuttX/nuttx', stderr=subprocess.STDOUT).decode('utf-8').strip().replace("nuttx-", "v") + nuttx_git_tags = subprocess.check_output('git -c versionsort.suffix=- tag --sort=v:refname'.split(), + cwd='platforms/nuttx/NuttX/nuttx', stderr=subprocess.STDOUT).decode('utf-8').strip() + nuttx_git_tag = re.findall(r'nuttx-[0-9]+\.[0-9]+\.[0-9]+', nuttx_git_tags)[-1].replace("nuttx-", "v") nuttx_git_tag = re.sub('-.*', '.0', nuttx_git_tag) nuttx_git_version = subprocess.check_output('git rev-parse --verify HEAD'.split(), cwd='platforms/nuttx/NuttX/nuttx', stderr=subprocess.STDOUT).decode('utf-8').strip()