Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-26 09:26:25 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

git: ignore git tags starting with 'ext/' when getting the version tag

Browse Source 
Allows for external/extra tags
This commit is contained in:
Beat Küng
2021-02-18 13:22:36 +01:00
committed by Daniel Agar
parent ae010ea55c
commit bac2a02a65
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tools/px4.py
+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 --abbrev=0 --tags'
cmd = 'git describe --exclude ext/* --abbrev=0 --tags'
try:
version = subprocess.check_output(
cmd, cwd=px4_dir, shell=True).decode().strip()
Tools/px_mkfw.py
+1 -1
View File
@@ -99,7 +99,7 @@ if args.summary != None:
if args.description != None:
desc['description'] = str(args.description)
if args.git_identity != None:
cmd = "git --git-dir '{:}/.git' describe --always --tags".format(args.git_identity)
cmd = "git --git-dir '{:}/.git' describe --exclude ext/* --always --tags".format(args.git_identity)
p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE).stdout
desc['git_identity'] = str(p.read().strip())
p.close()