#97: Fix typo and move validation before changelog creation
This commit is contained in:
parent
5d2556ca58
commit
5231798db1
|
@ -61,12 +61,6 @@ fi
|
||||||
TAG="$1"
|
TAG="$1"
|
||||||
MESSAGE="Creating release version $TAG"
|
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
|
# Validate that git tag doesn't already exist
|
||||||
git fetch --all --tags
|
git fetch --all --tags
|
||||||
if [ "$(git tag -l | grep -e "^$TAG$")" != '' ]; then
|
if [ "$(git tag -l | grep -e "^$TAG$")" != '' ]; then
|
||||||
|
@ -74,6 +68,12 @@ if [ "$(git tag -l | grep -e "^$TAG$")" != '' ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
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
|
# Write versionCode and versionName to a file that F-Droid can parse
|
||||||
echo "versionCode = $(version_code "${TOKENS[@]}")
|
echo "versionCode = $(version_code "${TOKENS[@]}")
|
||||||
versionName = $TAG" > fdroidversion.txt
|
versionName = $TAG" > fdroidversion.txt
|
||||||
|
|
Loading…
Reference in New Issue