From fce2a29a50ae8eb34c1122d7fa7ffffb4c97648f Mon Sep 17 00:00:00 2001 From: "Peter F. Patel-Schneider" Date: Tue, 21 Dec 2021 09:23:01 -0500 Subject: [PATCH] release: change order of checks in release.sh --- release.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/release.sh b/release.sh index fa64d7ff..cd51dc4f 100755 --- a/release.sh +++ b/release.sh @@ -85,6 +85,10 @@ read -p 'Are you *really* sure you want to proceed? (y/n) ' -n 1 -r < /dev/tty echo [[ ! $REPLY =~ ^[Yy]$ ]] && echo 'Release aborted.' && exit 1 +# Check if version is in the changelog +grep '^# '"$version" ChangeLog.md >/dev/null +[ $? -ne 0 ] && echo 'Error: Version is not present in the changelog' && exit 1 + # Check for uncomitted changes git diff --quiet HEAD >/dev/null [ $? -ne 0 ] && echo -e '\nError: Uncomitted changes found' && exit 1 @@ -106,10 +110,6 @@ git rev-list --max-count=1 $version >/dev/null 2>/dev/null git ls-remote $remote | grep "refs/tags/$version$" >/dev/null [ $? -eq 0 ] && echo -e '\nError: Tag already exists on remote' && exit 1 -# Check if version is in the changelog -grep '^# '"$version" ChangeLog.md >/dev/null -[ $? -ne 0 ] && echo 'Error: Version is not present in the changelog' && exit 1 - echo # Create tag