Skip to content

Commit 5fb7db2

Browse files
authored
🐛 Fix tag rendering (#58)
<!-- Copyright (C) 2020-2022 Arm Limited or its affiliates and Contributors. All rights reserved. SPDX-License-Identifier: Apache-2.0 --> ### Description Fix tag rendering ### 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).
1 parent 9e405b4 commit 5fb7db2

File tree

3 files changed

+16
-6
lines changed

3 files changed

+16
-6
lines changed

continuous_delivery_scripts/utils/versioning.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,10 @@ def determine_version_shortcuts(
108108
if not tag_shortcut:
109109
return shortcuts
110110
major_version = version_elements.get(auto_version_tool.definitions.SemVerSigFig.major, None)
111-
if major_version:
112-
shortcuts[major_version] = True
111+
if major_version or major_version == 0:
112+
shortcuts[f"{major_version}"] = True
113113
minor_version = version_elements.get(auto_version_tool.definitions.SemVerSigFig.minor, None)
114-
if minor_version and major_version:
114+
if (minor_version or minor_version == 0) and (major_version or major_version == 0):
115115
shortcuts[f"{major_version}.{minor_version}"] = True
116116
if commit_type == CommitType.BETA:
117117
shortcuts[auto_version_tool.config.PRERELEASE_TOKEN] = False

news/20221221151424.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fixed shortcut tag rendering when version contains `0`

tests/versioning/test_versioning.py

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,16 @@ def test_determine_version_shortcuts(self):
3939
CommitType.RELEASE,
4040
False,
4141
True,
42-
{definitions.SemVerSigFig.major: "1", definitions.SemVerSigFig.minor: "1"},
42+
{definitions.SemVerSigFig.major: 1, definitions.SemVerSigFig.minor: 1},
43+
),
44+
)
45+
self.assertDictEqual(
46+
{"latest": False, "1": True, "1.0": True},
47+
determine_version_shortcuts(
48+
CommitType.RELEASE,
49+
True,
50+
True,
51+
{definitions.SemVerSigFig.major: 1, definitions.SemVerSigFig.minor: 0},
4352
),
4453
)
4554
self.assertDictEqual(
@@ -57,7 +66,7 @@ def test_determine_version_shortcuts(self):
5766
CommitType.RELEASE,
5867
False,
5968
False,
60-
{definitions.SemVerSigFig.major: "1", definitions.SemVerSigFig.minor: "1"},
69+
{definitions.SemVerSigFig.major: "1", definitions.SemVerSigFig.minor: 1},
6170
),
6271
)
6372
self.assertDictEqual(
@@ -66,7 +75,7 @@ def test_determine_version_shortcuts(self):
6675
)
6776
self.assertDictEqual(
6877
{"1": True, "latest": False},
69-
determine_version_shortcuts(CommitType.RELEASE, True, True, {definitions.SemVerSigFig.major: "1"}),
78+
determine_version_shortcuts(CommitType.RELEASE, True, True, {definitions.SemVerSigFig.major: 1}),
7079
)
7180
self.assertDictEqual(
7281
{}, determine_version_shortcuts(CommitType.RELEASE, False, True, {definitions.SemVerSigFig.minor: "1"})

0 commit comments

Comments
 (0)