diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2021-01-15 11:36:52 +0100 |
|---|---|---|
| committer | Oliver Smith <osmith@sysmocom.de> | 2021-01-15 16:51:25 +0100 |
| commit | 0550cf9b921b10336852c056c24867f2f317c16b (patch) | |
| tree | f3c09c8b969e3b7684ff2691afe4d9450c529cfe /scripts/osmocom-nightly-packages.sh | |
| parent | 245b68316af27e81a0eebc99d17b56901a71e5ec (diff) | |
OBS: nightly: depend on dummy pkg of current date
Make it impossible to mix nightly/next builds of different dates.
Related: OS#4733
Change-Id: Ida8db8e6c91834c9d9e43694d9b4daea55a2f8f8
Diffstat (limited to 'scripts/osmocom-nightly-packages.sh')
| -rwxr-xr-x | scripts/osmocom-nightly-packages.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index ced0998..a6340d1 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -109,6 +109,7 @@ build() { local gitbpargs=$3 local repodir=$REPO/$name local oscdir=$REPO/osc/$PROJ/$name + local dependver="$OSMO_OBS_CONFLICT_PKGVER.$DT" if [ -z "$changelog" ] ; then changelog=commit @@ -129,7 +130,7 @@ build() { if [ "$changelog" = "commit" ] ; then VER=$(get_commit_version) - osmo_obs_add_depend_deb "./debian/control" "$name" "osmocom-$FEED" + osmo_obs_add_depend_deb "./debian/control" "$name" "osmocom-$FEED" "$dependver" dch -b -v "$VER" -m "Snapshot build" git commit -m "$VER snapshot" debian/ fi @@ -152,7 +153,7 @@ build() { cd "$oscdir" osc add -- *.tar* *.dsc - osmo_obs_add_rpm_spec "$oscdir" "$repodir" "$name" "osmocom-$FEED" + osmo_obs_add_rpm_spec "$oscdir" "$repodir" "$name" "osmocom-$FEED" "$dependver" osc ci -m "Snapshot $name $DT" --noservice } |