This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
osmith gerrit-no-reply at lists.osmocom.orgosmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/23947 ) Change subject: OBS: nightly: no change to osmocom-$FEED changelog ...................................................................... OBS: nightly: no change to osmocom-$FEED changelog Skip the logic to generate a new debian/changelog version for osmocom-nightly and osmocom-next packages in build(). Use $OSMO_OBS_CONFLICT_PKGVER instead, as it gets written to debian/changelog in common-obs-conflict.sh already, and append the date to the variable. Related: OS#5135 Change-Id: I85f0bcb633c16c7b5a81104f198d9561f53c0c01 --- 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 c90ed2f..6ae8a26 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -11,6 +11,7 @@ set -x DT=$(date +%Y%m%d%H%M) +OSMO_OBS_CONFLICT_PKGVER="$OSMO_OBS_CONFLICT_PKGVER.$DT" TOP=$(pwd)/$(mktemp -d nightly-3g_XXXXXX) # Set FEED and PROJ, based on the FEED env var @@ -117,7 +118,7 @@ local gitbpargs=$3 local repodir=$REPO/$name local oscdir=$REPO/osc/$PROJ/$name - local dependver="$OSMO_OBS_CONFLICT_PKGVER.$DT" + local dependver="$OSMO_OBS_CONFLICT_PKGVER" if [ -z "$changelog" ] ; then changelog=commit @@ -239,7 +240,7 @@ osmo_obs_checkout_copy debian8 osmo-gsm-manuals osmo_obs_checkout_copy debian8 osmo-trx - build osmocom-$FEED + build osmocom-$FEED no_commit build limesuite no_commit --git-upstream-tree="$(get_last_tag limesuite)" build osmo-gsm-manuals build osmo-gsm-manuals-debian8 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I85f0bcb633c16c7b5a81104f198d9561f53c0c01 Gerrit-Change-Number: 23947 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/5fa196a6/attachment.htm>