From fa284136537183cfdd3670b5f2ab1cd0164202fd Mon Sep 17 00:00:00 2001
From: Ryan Harg <3821-ryan_harg@users.noreply.dev.funkwhale.audio>
Date: Fri, 17 Sep 2021 14:03:08 +0000
Subject: [PATCH] #97: Update release date in changelog before committing
---
dist/create-release.sh | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/dist/create-release.sh b/dist/create-release.sh
index 62177eaf..c3c11a21 100755
--- a/dist/create-release.sh
+++ b/dist/create-release.sh
@@ -27,7 +27,7 @@ function version_code() {
((leadingZeros=2-${#token}))
for _ in $(seq 1 "$leadingZeros")
do
- token="${token}0"
+ token="0${token}"
done
result="$result$token"
done
@@ -69,7 +69,11 @@ if [ "$(git tag -l | grep -e "^$TAG$")" != '' ]; then
fi
echo "Compiling the changelog..."
-towncrier build --version "$TAG" --date $(date +"%Y-%m-%d")
+towncrier build --version="$TAG"
+
+# Manually fixing the release date in the changelog,
+# as towncrier's --date param doesn't seem to work
+sed -i '' "s/$TAG (unreleased)/$TAG ($(date +"%Y-%m-%d"))/g" CHANGELOG
git add CHANGELOG
git commit --message "Update changelog for version $TAG"
@@ -80,6 +84,8 @@ versionName = $TAG" > fdroidversion.txt
git add fdroidversion.txt
git commit --message "Update version information for F-Droid"
+git push
+
# Create and push tag
echo "Tagging the application..."
git tag -a -s -m "$MESSAGE" "$TAG"
--
GitLab