From 604dba774cc3ddce42b0f5ae692cfac3f7dd6757 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Fri, 25 Oct 2024 14:46:25 +0200
Subject: [PATCH 1/3] Update instruction

---
 tools/github/download_all_github_artifacts.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/github/download_all_github_artifacts.py b/tools/github/download_all_github_artifacts.py
index 906f122990..42c776d99d 100755
--- a/tools/github/download_all_github_artifacts.py
+++ b/tools/github/download_all_github_artifacts.py
@@ -10,7 +10,7 @@ import argparse
 import hashlib
 import json
 import os
-# Run `pip3 install requests` if not installed yet
+# Run `pip3 install requests --break-system-packages` if not installed yet
 import requests
 # Run `pip3 install re` if not installed yet
 import re

From 5b06680fd1db7fbee3a488e8c5d1116c4a32e05b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 25 Oct 2024 14:53:22 +0200
Subject: [PATCH 2/3] Give a chance for download_all_github_artifacts.py to
 fail and to try again, without breaking the release script. Previously any
 error in download_all_github_artifacts.py was ignored and the script was
 continuing (without success ofc).

---
 tools/release/release.sh | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/tools/release/release.sh b/tools/release/release.sh
index 56c6926da1..032007e780 100755
--- a/tools/release/release.sh
+++ b/tools/release/release.sh
@@ -185,11 +185,24 @@ targetPath="./tmp/Element/${version}"
 printf "\n================================================================================\n"
 printf "Downloading the artifacts...\n"
 
-python3 ./tools/github/download_all_github_artifacts.py \
+ret=1
+
+while [[ $ret -ne 0 ]]; do
+  python3 ./tools/github/download_all_github_artifacts.py \
      --token "${gitHubToken}" \
      --runUrl "${runUrl}" \
      --directory "${targetPath}"
 
+  ret=$?
+  if [[ $ret -ne 0 ]]; then
+    read -p "Error while downloading the artifacts. You may want to fix the issue and retry. Retry (yes/no) default to yes? " doRetry
+    doRetry=${doRetry:-yes}
+    if [ "${doRetry}" == "no" ]; then
+      exit 1
+    fi
+  fi
+done
+
 printf "\n================================================================================\n"
 printf "Unzipping the F-Droid artifact...\n"
 

From 8d81b364f53e5d59cabaf0ec56a510ec46b0c437 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 25 Oct 2024 14:54:23 +0200
Subject: [PATCH 3/3] Change default value of doBuildApks to "no"

---
 tools/release/release.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/release/release.sh b/tools/release/release.sh
index 032007e780..0503743455 100755
--- a/tools/release/release.sh
+++ b/tools/release/release.sh
@@ -325,8 +325,8 @@ printf "\n======================================================================
 printf "The file ${signedBundlePath} has been signed and can be uploaded to the PlayStore!\n"
 
 printf "\n================================================================================\n"
-read -p "Do you want to build the APKs from the app bundle? You need to do this step if you want to install the application to your device. (yes/no) default to yes " doBuildApks
-doBuildApks=${doBuildApks:-yes}
+read -p "Do you want to build the APKs from the app bundle? You need to do this step if you want to install the application to your device. (yes/no) default to no " doBuildApks
+doBuildApks=${doBuildApks:-no}
 
 if [ "${doBuildApks}" == "yes" ]; then
   printf "Building apks...\n"