aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorOliver Smith <osmith@sysmocom.de>2021-04-28 13:14:13 +0200
committerOliver Smith <osmith@sysmocom.de>2021-04-29 10:38:10 +0200
commite8f56403fcaf3aee928c82276eb0595b7d97117f (patch)
treefa74fa03a250d83e1aa14cf30ec750508e061114 /scripts
parent0bb023846505e524b7d6d61839ca06af28dc5f8a (diff)
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
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/osmocom-nightly-packages.sh5
1 files changed, 3 insertions, 2 deletions
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 @@ get_commit_version() {
# 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 @@ build() {
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/