<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/23971">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">OBS: nightly: build: simplify changelog parameter<br><br>Change-Id: I4a7f63f71d248b3796493adf6dc1be9c1b737c2e<br>---<br>M scripts/osmocom-nightly-packages.sh<br>1 file changed, 2 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/71/23971/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh</span><br><span>index a51ef55..86f406e 100755</span><br><span>--- a/scripts/osmocom-nightly-packages.sh</span><br><span>+++ b/scripts/osmocom-nightly-packages.sh</span><br><span>@@ -114,7 +114,7 @@</span><br><span> </span><br><span> # Generate a source package and upload it to OBS</span><br><span> # $1: package name (e.g. "libosmocore")</span><br><span style="color: hsl(0, 100%, 40%);">-# $2: update debian dir when set to "commit" (default):</span><br><span style="color: hsl(120, 100%, 40%);">+# $2: update debian dir, unless set to "no_commit":</span><br><span> #     * add dependency on osmocom-$FEED package</span><br><span> #     * add new version to changelog (e.g. "1.5.1.96.c96d7.202104281354")</span><br><span> # $3: arguments to pass to "gbp buildpackage"</span><br><span>@@ -126,10 +126,6 @@</span><br><span>   local oscdir=$REPO/osc/$PROJ/$name</span><br><span>   local dependver="$OSMO_OBS_CONFLICT_PKGVER"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  if [ -z "$changelog" ] ; then</span><br><span style="color: hsl(0, 100%, 40%);">-    changelog=commit</span><br><span style="color: hsl(0, 100%, 40%);">-  fi</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>   if [ -d "$oscdir" ] ; then</span><br><span>     # remove earlier version</span><br><span>     cd "$oscdir"</span><br><span>@@ -143,7 +139,7 @@</span><br><span> </span><br><span>   cd "$repodir"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  if [ "$changelog" = "commit" ] ; then</span><br><span style="color: hsl(120, 100%, 40%);">+  if [ "$changelog" != "no_commit" ] ; then</span><br><span>     # Add date to increase version even if commit did not change (OS#5135)</span><br><span>     VER="$(get_commit_version).$DT"</span><br><span>     osmo_obs_add_depend_deb "./debian/control" "$name" "osmocom-$FEED" "$dependver"</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/23971">change 23971</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-ci/+/23971"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-ci </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I4a7f63f71d248b3796493adf6dc1be9c1b737c2e </div>
<div style="display:none"> Gerrit-Change-Number: 23971 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>