Browse Source

Merge branch 'improve-release-script' into 'develop'

Improve release script

See merge request funkwhale/funkwhale-android!180
technical/upgrade-exoplayer
Ryan Harg 2 years ago
parent
commit
84816623e8
  1. 2
      changes/template.rst
  2. 11
      dist/create-release.sh
  3. 2
      towncrier.toml

2
changes/template.rst

@ -1,4 +1,4 @@
{{ versiondata.version }} ({{ versiondata.date }})
{% for section, _ in sections.items() %} {% for section, _ in sections.items() %}
{% if sections[section] %} {% if sections[section] %}
{% for category, val in definitions.items() if category in sections[section]%} {% for category, val in definitions.items() if category in sections[section]%}

11
dist/create-release.sh vendored

@ -69,11 +69,7 @@ if [ "$(git tag -l | grep -e "^$TAG$")" != '' ]; then
fi fi
echo "Compiling the changelog..." echo "Compiling the changelog..."
towncrier build --version="$TAG" towncrier build --version="$TAG" --date $(date +"%Y-%m-%d") --yes
# 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 add CHANGELOG
git commit --message "Update changelog for version $TAG" git commit --message "Update changelog for version $TAG"
@ -84,9 +80,10 @@ versionName = $TAG" > fdroidversion.txt
git add fdroidversion.txt git add fdroidversion.txt
git commit --message "Update version information for F-Droid" git commit --message "Update version information for F-Droid"
git push
# Create and push tag # Create and push tag
# Push tag first to make sure the Tag Pipeline runs
echo "Tagging the application..." echo "Tagging the application..."
git tag -a -s -m "$MESSAGE" "$TAG" git tag -a -s -m "$MESSAGE" "$TAG"
git push --tags git push --tags
git push

2
towncrier.toml

@ -6,7 +6,7 @@
start_string = ".. towncrier\n" start_string = ".. towncrier\n"
template = "changes/template.rst" template = "changes/template.rst"
issue_format = "" issue_format = ""
title_format = "{version} (unreleased)" title_format = false
underlines = "-" underlines = "-"
[[tool.towncrier.section]] [[tool.towncrier.section]]

Loading…
Cancel
Save