osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ci/+/42535?usp=email )
Change subject: OBS: nightly: add ".0" after versions on git tags
......................................................................
OBS: nightly: add ".0" after versions on git tags
Fix that with the current logic of generating version numbers for
nightly, a version done on a tag can be higher than the following
version:
on tag: 1.14.0.202603231800 #
<tag>.<YY><MM><DD><HH><mm><SS>
on tag (with this patch): 1.14.0.0.202603231800 #
<tag>.0.<YY><MM><DD><HH><mm><SS>
next commit after the tag: 1.14.0.1.2016.202603241800 #
<tag>.<patch-count-since-last-tag>.<commit-hash>.<YY><MM><DD><HH><mm><SS>
Fixes: OS#6981
Change-Id: Id140d8ea76bf98357711587a9909d54097250fd6
---
M scripts/obs/lib/srcpkg.py
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/35/42535/1
diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py
index b3e0422..8ed50df 100644
--- a/scripts/obs/lib/srcpkg.py
+++ b/scripts/obs/lib/srcpkg.py
@@ -106,6 +106,12 @@
if ":" in ret:
ret = ret.split(":")[1]
+ # Nightly: add a ".0" after the version if the current commit is on a
+ # version tag, so the next version is higher (OS#6981)
+ if lib.args.feed == "nightly":
+ while ret.count(".") < 3:
+ ret += ".0"
+
# Append the conflict_version to increase the version even if the commit
# did not change (OS#5135)
conflict_version = lib.args.conflict_version
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/42535?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Id140d8ea76bf98357711587a9909d54097250fd6
Gerrit-Change-Number: 42535
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <[email protected]>
