From 8e9e6fd02420e9406d6327a544f32cdb03227352 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sun, 28 Jun 2020 18:04:22 +0200 Subject: [PATCH] release: fix release script for "rc" --- contrib/fedora/rpm/release.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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"