Skip to content
Snippets Groups Projects
Commit 43a7a10d authored by Ryan Harg's avatar Ryan Harg
Browse files

Merge branch 'enhancement/97-fix-release-script' into 'develop'

#97: Fix typo and move validation before changelog creation

See merge request !111
parents 5d2556ca 5231798d
Branches
Tags
1 merge request!111#97: Fix typo and move validation before changelog creation
Pipeline #16464 passed
...@@ -61,12 +61,6 @@ fi ...@@ -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 ...@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment