Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-30 18:06:39 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

px_update_git_header.py: allow -beta/-rc in tag

Browse Source 
This changes two things:
- This adds "-beta" as a valid tag suffix.
- This changes "rc" without "-" to "-rc". "rc" without is now described
  as deprecated and with "-rc" is preferred.
This commit is contained in:
Julian Oes
2019-08-22 17:55:30 +02:00
committed by Lorenz Meier
parent f4b40865af
commit 68078795c0
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/version/px_update_git_header.py
+5 -3
View File
@@ -47,7 +47,7 @@ if validate:
# remove optional -<num_commits>-g<commit_hash> at the end (in case we are not on a tagged commit) # remove optional -<num_commits>-g<commit_hash> at the end (in case we are not on a tagged commit)
git_tag_test = re.sub(r'-[0-9]+-g[0-9a-fA-F]+$', '', git_tag_test) git_tag_test = re.sub(r'-[0-9]+-g[0-9a-fA-F]+$', '', git_tag_test)
# now check the version format # now check the version format
m = re.match(r'v([0-9]+)\.([0-9]+)\.[0-9]+(rc[0-9]+)?(-[0-9]+\.[0-9]+\.[0-9]+)?$', git_tag_test) m = re.match(r'v([0-9]+)\.([0-9]+)\.[0-9]+([-]?rc[0-9]+)?(-beta[0-9]+)?(-[0-9]+\.[0-9]+\.[0-9]+)?$', git_tag_test)
if m: if m:
# format matches, check the major and minor numbers # format matches, check the major and minor numbers
major = int(m.group(1)) major = int(m.group(1))
@@ -63,10 +63,12 @@ if validate:
print("Error: the git tag '{:}' does not match the expected format.".format(git_tag_test)) print("Error: the git tag '{:}' does not match the expected format.".format(git_tag_test))
print("") print("")
print("The expected format is 'v<PX4 version>[-<custom version>]'") print("The expected format is 'v<PX4 version>[-<custom version>]'")
print(" <PX4 version>: v<major>.<minor>.<patch>[rc<rc>]") print(" <PX4 version>: v<major>.<minor>.<patch>[-rc<rc>|-beta<beta>]")
print(" <custom version>: <major>.<minor>.<patch>") print(" <custom version>: <major>.<minor>.<patch>")
print("Examples:") print("Examples:")
print(" v1.9.0rc3") print(" v1.9.0rc3 (deprecated)")
print(" v1.9.0-rc3 (preferred)")
print(" v1.9.0-beta1")
print(" v1.9.0-1.0.0") print(" v1.9.0-1.0.0")
print("See also https://dev.px4.io/master/en/setup/building_px4.html#firmware_version") print("See also https://dev.px4.io/master/en/setup/building_px4.html#firmware_version")
print("") print("")