Issue #92 Bump version number and switch to 3-part version numbers

This commit is contained in:
Mat Sutcliffe
2021-02-17 23:38:28 +00:00
parent 8f11e42b15
commit 855c97bc88
9 changed files with 19 additions and 27 deletions

View File

@@ -228,8 +228,7 @@ class Builder:
f.close()
version_major = config_json['version']['major']
version_minor = config_json['version']['minor']
version_micro = config_json['version']['micro']
return '.'.join([str(version_major), str(version_minor), str(version_micro)])
return '.'.join([str(version_major), str(version_minor)])
def __get_rev_count(self):
this_version = self.__get_swift_version_base()
@@ -239,8 +238,7 @@ class Builder:
config_json = json.loads(json_data.decode("utf-8"))
version_major = config_json['version']['major']
version_minor = config_json['version']['minor']
version_micro = config_json['version']['micro']
if this_version == '.'.join([str(version_major), str(version_minor), str(version_micro)]):
if this_version == '.'.join([str(version_major), str(version_minor)]):
base_commit = sha
else:
break