Skip to content

Commit 4b72429

Browse files
authored
Merge pull request #3741 from element-hq/feature/bma/releaseImprovement
Release script improvement
2 parents 40d3fca + 8d81b36 commit 4b72429

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

tools/github/download_all_github_artifacts.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import hashlib
1111
import json
1212
import os
13-
# Run `pip3 install requests` if not installed yet
13+
# Run `pip3 install requests --break-system-packages` if not installed yet
1414
import requests
1515
# Run `pip3 install re` if not installed yet
1616
import re

tools/release/release.sh

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,11 +185,24 @@ targetPath="./tmp/Element/${version}"
185185
printf "\n================================================================================\n"
186186
printf "Downloading the artifacts...\n"
187187

188-
python3 ./tools/github/download_all_github_artifacts.py \
188+
ret=1
189+
190+
while [[ $ret -ne 0 ]]; do
191+
python3 ./tools/github/download_all_github_artifacts.py \
189192
--token "${gitHubToken}" \
190193
--runUrl "${runUrl}" \
191194
--directory "${targetPath}"
192195

196+
ret=$?
197+
if [[ $ret -ne 0 ]]; then
198+
read -p "Error while downloading the artifacts. You may want to fix the issue and retry. Retry (yes/no) default to yes? " doRetry
199+
doRetry=${doRetry:-yes}
200+
if [ "${doRetry}" == "no" ]; then
201+
exit 1
202+
fi
203+
fi
204+
done
205+
193206
printf "\n================================================================================\n"
194207
printf "Unzipping the F-Droid artifact...\n"
195208

@@ -312,8 +325,8 @@ printf "\n======================================================================
312325
printf "The file ${signedBundlePath} has been signed and can be uploaded to the PlayStore!\n"
313326

314327
printf "\n================================================================================\n"
315-
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
316-
doBuildApks=${doBuildApks:-yes}
328+
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
329+
doBuildApks=${doBuildApks:-no}
317330

318331
if [ "${doBuildApks}" == "yes" ]; then
319332
printf "Building apks...\n"

0 commit comments

Comments
 (0)