From 98b1dba100443aba1970dba86daeb9442741cdc0 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Mon, 24 Jun 2024 10:00:15 +0200 Subject: [PATCH] release.sh: update version check (cherry picked from commit cfc3f3fed767d096b45029422d1631df983f5ae9) (cherry picked from commit 39c0e8cf301b57fec17bde7ccf78c93399ffa63e) (cherry picked from commit 01a03c7a5ac0defa478893be9581da1d11c1e522) (cherry picked from commit f5e0d856f7df032229d026a519f46b9ca5553636) --- 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 f4ee4cb65d..de011a136c 100755 --- a/contrib/fedora/rpm/release.sh +++ b/contrib/fedora/rpm/release.sh @@ -368,7 +368,8 @@ if [ -n "$RELEASE_BRANCH" ]; then fi if [ "$ALLOW_LOCAL_BRANCHES" != 1 ]; then - cmp <(git show "$ORIGIN/main:contrib/fedora/rpm/release.sh") "$BASH_SOURCE_ABSOLUTE" || die "$BASH_SOURCE is not identical to \`git show \"$ORIGIN/main:contrib/fedora/rpm/release.sh\"\`" + # The release process changed a bit in nm-1-50, so previous versions has to be compared to nm-1-48, not to main + cmp <(git show "$ORIGIN/nm-1-48:contrib/fedora/rpm/release.sh") "$BASH_SOURCE_ABSOLUTE" || die "$BASH_SOURCE is not identical to \`git show \"$ORIGIN/nm-1-48:contrib/fedora/rpm/release.sh\"\`" fi if ! check_news "$RELEASE_MODE" "@{VERSION_ARR[@]}" ; then