diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-06-28 18:04:22 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-06-28 18:06:17 +0200 |
| commit | 8e9e6fd02420e9406d6327a544f32cdb03227352 (patch) | |
| tree | b02c78fbea49e35579e820e22733bf4296e2390f /contrib | |
| parent | 071104124b1159bf2e82ac62b9f0b03de64eb38d (diff) | |
release: fix release script for "rc"
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/fedora/rpm/release.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/fedora/rpm/release.sh b/contrib/fedora/rpm/release.sh index 461d79ef7e..ae94bf479f 100755 --- a/contrib/fedora/rpm/release.sh +++ b/contrib/fedora/rpm/release.sh @@ -180,11 +180,12 @@ case "$RELEASE_MODE" in number_is_odd "${VERSION_ARR[1]}" || die "cannot do devel release on top of version $VERSION_STR" if [ "$RELEASE_MODE" = devel ]; then [ "$((${VERSION_ARR[2]} + 1))" -lt 90 ] || die "devel release must have a micro version smaller than 90 but current version is $VERSION_STR" + [ "$CUR_BRANCH" == master ] || die "devel release can only be on master" else [ "${VERSION_ARR[2]}" -ge 90 ] || die "rc release must have a micro version larger than ${VERSION_ARR[0]}.90 but current version is $VERSION_STR" RC_VERSION="$((${VERSION_ARR[2]} - 90))" + [ "$CUR_BRANCH" == "nm-${VERSION_ARR[0]}-$((${VERSION_ARR[1]} + 1))" ] || die "devel release can only be on \"nm-${VERSION_ARR[0]}-$((${VERSION_ARR[1]} + 1))\" branch" fi - [ "$CUR_BRANCH" == master ] || die "devel release can only be on master" ;; *) die "Release mode $RELEASE_MODE not yet implemented" |