diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-06-30 13:53:37 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-06-30 13:57:15 +0200 |
| commit | ae626ade0f5834a4b4c897a930faa8b32964b97f (patch) | |
| tree | 826f7197b03549d5d5229fbddfee546e4d2adf65 /contrib | |
| parent | 66651d56600d020ce8cc9f118bfca47656138f7f (diff) | |
contrib: consistency check meson.build in release script
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/fedora/rpm/release.sh | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/contrib/fedora/rpm/release.sh b/contrib/fedora/rpm/release.sh index aac28c5707..9dba4e995a 100755 --- a/contrib/fedora/rpm/release.sh +++ b/contrib/fedora/rpm/release.sh @@ -79,11 +79,11 @@ do_command() { } parse_version() { - local MAJ="$(sed -n '1,20 s/^m4_define(\[nm_major_version\], \[\([0-9]\+\)\])$/\1/p' configure.ac)" - local MIN="$(sed -n '1,20 s/^m4_define(\[nm_minor_version\], \[\([0-9]\+\)\])$/\1/p' configure.ac)" - local MIC="$(sed -n '1,20 s/^m4_define(\[nm_micro_version\], \[\([0-9]\+\)\])$/\1/p' configure.ac)" + local MAJ="$(sed -n '1,20 s/^m4_define(\[nm_major_version\], \[\([0-9]\+\)\])$/\1/p' ./configure.ac)" + local MIN="$(sed -n '1,20 s/^m4_define(\[nm_minor_version\], \[\([0-9]\+\)\])$/\1/p' ./configure.ac)" + local MIC="$(sed -n '1,20 s/^m4_define(\[nm_micro_version\], \[\([0-9]\+\)\])$/\1/p' ./configure.ac)" - re='^[0-9]+ [0-9]+ [0-9]+$' + re='^[0-9][1-9]* [0-9][1-9]* [0-9][1-9]*$' [[ "$MAJ $MIN $MIC" =~ $re ]] || return 1 echo "$MAJ $MIN $MIC" } @@ -193,6 +193,8 @@ VERSION_STR="$(IFS=.; echo "${VERSION_ARR[*]}")" echo "Current version before release: $VERSION_STR (do \"$RELEASE_MODE\" release)" +grep -q "version: '${VERSION_ARR[0]}.${VERSION_ARR[1]}.${VERSION_ARR[2]}'," ./meson.build || die "meson.build does not have expected version" + TMP="$(git status --porcelain)" || die "git status failed" test -z "$TMP" || die "git working directory is not clean (git status --porcelain)" @@ -204,14 +206,16 @@ TMP_BRANCH=release-branch if [ "$CUR_BRANCH" = master ]; then number_is_odd "${VERSION_ARR[1]}" || die "Unexpected version number on master. Should be an odd development version" + [ "$RELEASE_MODE" = devel -o "$RELEASE_MODE" = rc1 ] || "Unexpected branch name \"$CUR_BRANCH\" for \"$RELEASE_MODE\"" else - re='^nm-[0-9]+-[0-9]+$' + re='^nm-[0-9][1-9]*-[0-9][1-9]*$' [[ "$CUR_BRANCH" =~ $re ]] || die "Unexpected current branch $CUR_BRANCH. Should be master or nm-?-??" if number_is_odd "${VERSION_ARR[1]}"; then # we are on a release candiate branch. - [ "$RELEASE_MODE" = rc ] || "Unexpected branch name \"$CUR_BRANCH\" for \"$RELEASE_MODE\"" + [ "$RELEASE_MODE" = rc -o "$RELEASE_MODE" = major ] || "Unexpected branch name \"$CUR_BRANCH\" for \"$RELEASE_MODE\"" [ "$CUR_BRANCH" == "nm-${VERSION_ARR[0]}-$((${VERSION_ARR[1]} + 1))" ] || die "Unexpected current branch $CUR_BRANCH. Should be nm-${VERSION_ARR[0]}-$((${VERSION_ARR[1]} + 1))" else + [ "$RELEASE_MODE" = minor ] || "Unexpected branch name \"$CUR_BRANCH\" for \"$RELEASE_MODE\"" [ "$CUR_BRANCH" == "nm-${VERSION_ARR[0]}-${VERSION_ARR[1]}" ] || die "Unexpected current branch $CUR_BRANCH. Should be nm-${VERSION_ARR[0]}-${VERSION_ARR[1]}" fi fi |