From 86ce65c1e4f64ab4c0f93f40f010c2eb261e47d0 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 27 Jun 2024 12:24:22 +0200
Subject: [PATCH] Remove towncrier: iterate on release script.

---
 tools/release/release.sh | 50 ++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 27 deletions(-)

diff --git a/tools/release/release.sh b/tools/release/release.sh
index d51a702388..bec36680fd 100755
--- a/tools/release/release.sh
+++ b/tools/release/release.sh
@@ -141,17 +141,6 @@ rm ${versionsFileBak}
 # This commit may have no effect because generally we do not change the version during the release.
 git commit -a -m "Setting version for the release ${version}"
 
-printf "\n================================================================================\n"
-printf "Running towncrier...\n"
-yes | towncrier build --version "v${version}"
-
-printf "\n================================================================================\n"
-read -p "Check the file CHANGES.md consistency. It's possible to reorder items (most important changes first) or change their section if relevant. Also an opportunity to fix some typo, or rewrite things. Do not commit your change. Press enter to continue. "
-
-printf "\n================================================================================\n"
-printf "Committing...\n"
-git commit -a -m "Changelog for version ${version}"
-
 printf "\n================================================================================\n"
 printf "Creating fastlane file...\n"
 printf -v versionMajor2Digits "%02d" "${versionMajor}"
@@ -198,17 +187,6 @@ read -p "I have updated the versions to prepare the next release, please check t
 printf "Committing...\n"
 git commit -a -m 'version++'
 
-printf "\n================================================================================\n"
-read -p "Done, push the branch 'develop' (yes/no) default to yes? (A rebase may be necessary in case develop got new commits) " doPush
-doPush=${doPush:-yes}
-
-if [ "${doPush}" == "yes" ]; then
-  printf "Pushing branch 'develop'...\n"
-  git push origin develop
-else
-    printf "Not pushing, do not forget to push manually!\n"
-fi
-
 printf "\n================================================================================\n"
 printf "Wait for the GitHub action https://github.com/element-hq/element-x-android/actions/workflows/release.yml?query=branch%%3Amain to build the 'main' branch.\n"
 printf "Please enter the url of the github action (!!! WARNING: NOT THE URL OF THE ARTIFACT ANYMORE !!!)\n"
@@ -380,19 +358,37 @@ printf "You can then go to \"Publishing overview\" and send the new release for
 read -p "Press enter to continue. "
 
 printf "\n================================================================================\n"
-# Url encode for "<!-- Copy paste the section of the file CHANGES.md for this release here -->"
-body="%3C%21--%20Copy%20paste%20the%20section%20of%20the%20file%20CHANGES.md%20for%20this%20release%20here%20--%3E"
-githubCreateReleaseLink="https://github.com/element-hq/element-x-android/releases/new?tag=v${version}&title=Element%20X%20Android%20v${version}&body=${body}"
+githubCreateReleaseLink="https://github.com/element-hq/element-x-android/releases/new?tag=v${version}&title=Element%20X%20Android%20v${version}"
 printf "Creating the release on gitHub.\n"
 printf -- "Open this link: %s\n" "${githubCreateReleaseLink}"
 printf "Then\n"
-printf " - copy paste the section of the file CHANGES.md for this release.\n"
-printf " - click on the 'Generate releases notes' button.\n"
+printf " - Click on the 'Generate releases notes' button.\n"
+printf " - Optionally reorder items and fix typos.\n"
 printf " - Add the file ${signedBundlePath} to the GitHub release.\n"
 printf " - Add the universal APK, downloaded from the GooglePlay console to the GitHub release.\n"
 printf " - Add the 4 signed APKs for F-Droid, located at ${fdroidTargetPath} to the GitHub release.\n"
 read -p ". Press enter to continue. "
 
+printf "\n================================================================================\n"
+printf "Update the project release notes:\n\n"
+
+read -p "Copy the content of the release note generated by GitHub to the file CHANGES.md and press enter to commit the change. \n"
+
+printf "\n================================================================================\n"
+printf "Committing...\n"
+git commit -a -m "Changelog for version ${version}"
+
+printf "\n================================================================================\n"
+read -p "Done, push the branch 'develop' (yes/no) default to yes? (A rebase may be necessary in case develop got new commits) " doPush
+doPush=${doPush:-yes}
+
+if [ "${doPush}" == "yes" ]; then
+  printf "Pushing branch 'develop'...\n"
+  git push origin develop
+else
+    printf "Not pushing, do not forget to push manually!\n"
+fi
+
 printf "\n================================================================================\n"
 printf "Message for the Android internal room:\n\n"
 message="@room Element X Android ${version} is ready to be tested. You can get it from https://github.com/element-hq/element-x-android/releases/tag/v${version}. You can install the universal APK. If you want to install the application from the app bundle, you can follow instructions [here](https://github.com/element-hq/element-x-android/blob/develop/docs/install_from_github_release.md). Please report any feedback. Thanks!"