From 5231798db1d4a849f16961df3951c276ef70f205 Mon Sep 17 00:00:00 2001 From: Ryan Harg Date: Fri, 17 Sep 2021 09:03:30 +0200 Subject: [PATCH] #97: Fix typo and move validation before changelog creation --- dist/create-release.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dist/create-release.sh b/dist/create-release.sh index 43106b3..4487eca 100755 --- a/dist/create-release.sh +++ b/dist/create-release.sh @@ -61,12 +61,6 @@ fi TAG="$1" MESSAGE="Creating release version $TAG" -echo "Compiling the changelog..." -towncrier build --version "$TAG" --date $(date +"%Y-%m-%d") - -git add CHANGELOG -git comit --message "Update changelog for version $TAG" - # Validate that git tag doesn't already exist git fetch --all --tags if [ "$(git tag -l | grep -e "^$TAG$")" != '' ]; then @@ -74,6 +68,12 @@ if [ "$(git tag -l | grep -e "^$TAG$")" != '' ]; then exit 1 fi +echo "Compiling the changelog..." +towncrier build --version "$TAG" --date $(date +"%Y-%m-%d") + +git add CHANGELOG +git commit --message "Update changelog for version $TAG" + # Write versionCode and versionName to a file that F-Droid can parse echo "versionCode = $(version_code "${TOKENS[@]}") versionName = $TAG" > fdroidversion.txt