Skip to content

Commit 629d5ae

Browse files
kevinAlbsrcsanchez97
authored andcommitted
fix abi-compliance-check task (#1039)
Account for prerelease marker when computing previous release version in calc_release_version.py
1 parent 64aee06 commit 629d5ae

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

build/calc_release_version.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
NEXT_MINOR = len(sys.argv) > 1 and '--next-minor' in sys.argv
3939

4040
PREVIOUS_TAG_RE = re.compile('(?P<ver>(?P<vermaj>[0-9]+)\\.(?P<vermin>[0-9]+)'
41-
'\\.(?P<verpatch>[0-9]+))')
41+
'\\.(?P<verpatch>[0-9]+)(?:-(?P<verpre>.*))?)')
4242
RELEASE_TAG_RE = re.compile('(?P<ver>(?P<vermaj>[0-9]+)\\.(?P<vermin>[0-9]+)'
4343
'\\.(?P<verpatch>[0-9]+)(?:-(?P<verpre>.*))?)')
4444
RELEASE_BRANCH_RE = re.compile('(?:(?:refs/remotes/)?origin/)?(?P<brname>r'
@@ -219,9 +219,8 @@ def previous(rel_ver):
219219
version_new['major'] = int(previous_tag_match.group('vermaj'))
220220
version_new['minor'] = int(previous_tag_match.group('vermin'))
221221
version_new['patch'] = int(previous_tag_match.group('verpatch'))
222-
new_version_loose = LooseVersion(str(version_new['major']) + '.' +
223-
str(version_new['minor']) + '.' +
224-
str(version_new['patch']))
222+
version_new['prerelease'] = previous_tag_match.group('verpre')
223+
new_version_loose = LooseVersion(tag)
225224
if new_version_loose < rel_ver_loose and new_version_loose > version_loose:
226225
version_loose = new_version_loose
227226
if DEBUG:

0 commit comments

Comments
 (0)