Change in osmo-ci[master]: OBS: nightly: append date to all packages

[osmith]

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/23948 )

Change subject: OBS: nightly: append date to all packages
......................................................................

OBS: nightly: append date to all packages

Instead of only appending the date to non-Osmocom packages in
get_commit_version, append it to all packages in build(). This ensures
we increase the version of Osmocom packages even if the commit did not
change.

Fixes: OS#5135
Change-Id: I04d84f39f4093c8edfe21a94c10ecb8d3c7b5b64
---
M scripts/osmocom-nightly-packages.sh
1 file changed, 3 insertions(+), 2 deletions(-)

Approvals:
  laforge: Looks good to me, but someone else must approve
  pespin: Looks good to me, but someone else must approve
  osmith: Looks good to me, approved; Verified



diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh
index 6ae8a26..bc45188 100755
--- a/scripts/osmocom-nightly-packages.sh
+++ b/scripts/osmocom-nightly-packages.sh
@@ -73,7 +73,7 @@
   # deb version
   deb_version=$(head -1 debian/changelog | cut -d ' ' -f 2 | sed 's,(,,'  | sed 's,),,')
   if [ -z "$version" ] || [ "$version" = "UNKNOWN" ]; then
-    version="$deb_version.$DT"
+    version="$deb_version"
   else
     # add epoch from debian/changelog
     case $deb_version in
@@ -138,7 +138,8 @@
   cd "$repodir"
 
   if [ "$changelog" = "commit" ] ; then
-    VER=$(get_commit_version)
+    # Add date to increase version even if commit did not change (OS#5135)
+    VER="$(get_commit_version).$DT"
     osmo_obs_add_depend_deb "./debian/control" "$name" "osmocom-$FEED" "$dependver"
     dch -b -v "$VER" -m "Snapshot build"
     git commit -m "$VER snapshot" debian/

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23948
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I04d84f39f4093c8edfe21a94c10ecb8d3c7b5b64
Gerrit-Change-Number: 23948
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210429/e257492f/attachment.htm>