#97: Fix typo and move validation before changelog creation

This commit is contained in:
Ryan Harg 2021-09-17 09:03:30 +02:00
parent 5d2556ca58
commit 5231798db1
No known key found for this signature in database
GPG Key ID: 89106F3A84E6958C
1 changed files with 6 additions and 6 deletions

View File

@ -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