@@ -141,15 +141,24 @@ <h1 class="title">Module <code>continuous_delivery_scripts.utils.versioning</cod
141141 if not tag_shortcut:
142142 return shortcuts
143143 major_version = version_elements.get(auto_version_tool.definitions.SemVerSigFig.major, None)
144- if major_version or major_version == 0:
145- shortcuts[f"{major_version}"] = True
146144 minor_version = version_elements.get(auto_version_tool.definitions.SemVerSigFig.minor, None)
147- if (minor_version or minor_version == 0) and (major_version or major_version == 0):
148- shortcuts[f"{major_version}.{minor_version}"] = True
149- if commit_type == CommitType.BETA:
145+ if commit_type == CommitType.RELEASE:
146+ if major_version or major_version == 0:
147+ shortcuts[f"{major_version}"] = True
148+ if (minor_version or minor_version == 0) and (major_version or major_version == 0):
149+ shortcuts[f"{major_version}.{minor_version}"] = True
150+ elif commit_type == CommitType.BETA:
150151 shortcuts[str(auto_version_tool.config.PRERELEASE_TOKEN)] = False
151- if commit_type == CommitType.DEVELOPMENT:
152+ if major_version or major_version == 0:
153+ shortcuts[f"{major_version}-{auto_version_tool.config.PRERELEASE_TOKEN}"] = True
154+ if (minor_version or minor_version == 0) and (major_version or major_version == 0):
155+ shortcuts[f"{major_version}.{minor_version}-{auto_version_tool.config.PRERELEASE_TOKEN}"] = True
156+ elif commit_type == CommitType.DEVELOPMENT:
152157 shortcuts[str(auto_version_tool.config.BUILD_TOKEN)] = False
158+ if major_version or major_version == 0:
159+ shortcuts[f"{major_version}-{auto_version_tool.config.BUILD_TOKEN}"] = True
160+ if (minor_version or minor_version == 0) and (major_version or major_version == 0):
161+ shortcuts[f"{major_version}.{minor_version}-{auto_version_tool.config.BUILD_TOKEN}"] = True
153162 commit_count = version_elements.get(auto_version_tool.Constants.COMMIT_COUNT_FIELD, None)
154163 if not commit_count:
155164 with LocalProjectRepository() as git:
@@ -293,15 +302,24 @@ <h2 id="returns">Returns</h2>
293302 if not tag_shortcut:
294303 return shortcuts
295304 major_version = version_elements.get(auto_version_tool.definitions.SemVerSigFig.major, None)
296- if major_version or major_version == 0:
297- shortcuts[f"{major_version}"] = True
298305 minor_version = version_elements.get(auto_version_tool.definitions.SemVerSigFig.minor, None)
299- if (minor_version or minor_version == 0) and (major_version or major_version == 0):
300- shortcuts[f"{major_version}.{minor_version}"] = True
301- if commit_type == CommitType.BETA:
306+ if commit_type == CommitType.RELEASE:
307+ if major_version or major_version == 0:
308+ shortcuts[f"{major_version}"] = True
309+ if (minor_version or minor_version == 0) and (major_version or major_version == 0):
310+ shortcuts[f"{major_version}.{minor_version}"] = True
311+ elif commit_type == CommitType.BETA:
302312 shortcuts[str(auto_version_tool.config.PRERELEASE_TOKEN)] = False
303- if commit_type == CommitType.DEVELOPMENT:
313+ if major_version or major_version == 0:
314+ shortcuts[f"{major_version}-{auto_version_tool.config.PRERELEASE_TOKEN}"] = True
315+ if (minor_version or minor_version == 0) and (major_version or major_version == 0):
316+ shortcuts[f"{major_version}.{minor_version}-{auto_version_tool.config.PRERELEASE_TOKEN}"] = True
317+ elif commit_type == CommitType.DEVELOPMENT:
304318 shortcuts[str(auto_version_tool.config.BUILD_TOKEN)] = False
319+ if major_version or major_version == 0:
320+ shortcuts[f"{major_version}-{auto_version_tool.config.BUILD_TOKEN}"] = True
321+ if (minor_version or minor_version == 0) and (major_version or major_version == 0):
322+ shortcuts[f"{major_version}.{minor_version}-{auto_version_tool.config.BUILD_TOKEN}"] = True
305323 commit_count = version_elements.get(auto_version_tool.Constants.COMMIT_COUNT_FIELD, None)
306324 if not commit_count:
307325 with LocalProjectRepository() as git:
0 commit comments