🐛 fix prerelease shortcut tags (#64)

<!--
Copyright (C) 2020-2022 Arm Limited or its affiliates and Contributors.
All rights reserved.
SPDX-License-Identifier: Apache-2.0
-->
### Description
fix prerelease shortcut tags



### Test Coverage

<!--
Please put an `x` in the correct box e.g. `[x]` to indicate the testing
coverage of this change.
-->

- [x]  This change is covered by existing or additional automated tests.
- [ ] Manual testing has been performed (and evidence provided) as
automated testing was not feasible.
- [ ] Additional tests are not required for this change (e.g.
documentation update).

Author: acabarbaye

continuous_delivery_scripts/plugins/NOOP.MD

@@ -1,9 +1,9 @@
 # No Op plugin
 
-This plugin is used for simple git projects when `PROGRAMMING_LANGUAGE` is set to `noop`.
+This plugin is used when `PROGRAMMING_LANGUAGE` is set to `noop`.
 
 ## Release
-Only git operations (tagging, version incrementation, changelog commit) are performed
+This plugin performs no operation
 
 ## Documentation
 N/A

continuous_delivery_scripts/utils/versioning.py

@@ -108,15 +108,24 @@ def determine_version_shortcuts(
     if not tag_shortcut:
         return shortcuts
     major_version = version_elements.get(auto_version_tool.definitions.SemVerSigFig.major, None)
-    if major_version or major_version == 0:
-        shortcuts[f"{major_version}"] = True
     minor_version = version_elements.get(auto_version_tool.definitions.SemVerSigFig.minor, None)
-    if (minor_version or minor_version == 0) and (major_version or major_version == 0):
-        shortcuts[f"{major_version}.{minor_version}"] = True
-    if commit_type == CommitType.BETA:
+    if commit_type == CommitType.RELEASE:
+        if major_version or major_version == 0:
+            shortcuts[f"{major_version}"] = True
+        if (minor_version or minor_version == 0) and (major_version or major_version == 0):
+            shortcuts[f"{major_version}.{minor_version}"] = True
+    elif commit_type == CommitType.BETA:
         shortcuts[str(auto_version_tool.config.PRERELEASE_TOKEN)] = False
-    if commit_type == CommitType.DEVELOPMENT:
+        if major_version or major_version == 0:
+            shortcuts[f"{major_version}-{auto_version_tool.config.PRERELEASE_TOKEN}"] = True
+        if (minor_version or minor_version == 0) and (major_version or major_version == 0):
+            shortcuts[f"{major_version}.{minor_version}-{auto_version_tool.config.PRERELEASE_TOKEN}"] = True
+    elif commit_type == CommitType.DEVELOPMENT:
         shortcuts[str(auto_version_tool.config.BUILD_TOKEN)] = False
+        if major_version or major_version == 0:
+            shortcuts[f"{major_version}-{auto_version_tool.config.BUILD_TOKEN}"] = True
+        if (minor_version or minor_version == 0) and (major_version or major_version == 0):
+            shortcuts[f"{major_version}.{minor_version}-{auto_version_tool.config.BUILD_TOKEN}"] = True
         commit_count = version_elements.get(auto_version_tool.Constants.COMMIT_COUNT_FIELD, None)
         if not commit_count:
             with LocalProjectRepository() as git:

news/20221222112207.bugfix

@@ -0,0 +1 @@
+:bug: prerelease tag shortcuts

tests/versioning/test_versioning.py

@@ -81,13 +81,17 @@ def test_determine_version_shortcuts(self):
             {}, determine_version_shortcuts(CommitType.RELEASE, False, True, {definitions.SemVerSigFig.minor: "1"})
         )
         self.assertDictEqual(
-            {"1": True, "1.1": True, config.PRERELEASE_TOKEN: False},
+            {
+                config.PRERELEASE_TOKEN: False,
+                f"1-{config.PRERELEASE_TOKEN}": True,
+                f"1.1-{config.PRERELEASE_TOKEN}": True,
+            },
             determine_version_shortcuts(
                 CommitType.BETA, True, True, {definitions.SemVerSigFig.major: "1", definitions.SemVerSigFig.minor: "1"}
             ),
         )
         self.assertTrue(
-            "1.1"
+            f"1.1-{config.BUILD_TOKEN}"
             in determine_version_shortcuts(
                 CommitType.DEVELOPMENT,
                 True,
@@ -96,7 +100,7 @@ def test_determine_version_shortcuts(self):
             ).keys()
         )
         self.assertTrue(
-            "1"
+            f"1-{config.BUILD_TOKEN}"
             in determine_version_shortcuts(
                 CommitType.DEVELOPMENT,
                 True,