From e441d4b15edf488ab786ad1b9aa3f2beba9505f4 Mon Sep 17 00:00:00 2001 From: ThomasV Date: Wed, 22 Nov 2023 18:05:55 +0100 Subject: [PATCH] release-sh: build each android apk separately this triggers a cleanup of the fresh clone directory --- contrib/release.sh | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/contrib/release.sh b/contrib/release.sh index 3320eb8a5..1869dedc5 100755 --- a/contrib/release.sh +++ b/contrib/release.sh @@ -145,24 +145,22 @@ else fi # android -apk1="Electrum-$VERSION.0-armeabi-v7a-release.apk" -apk1_unsigned="Electrum-$VERSION.0-armeabi-v7a-release-unsigned.apk" -apk2="Electrum-$VERSION.0-arm64-v8a-release.apk" -apk2_unsigned="Electrum-$VERSION.0-arm64-v8a-release-unsigned.apk" -apk3="Electrum-$VERSION.0-x86_64-release.apk" -apk3_unsigned="Electrum-$VERSION.0-x86_64-release-unsigned.apk" -if test -f "dist/$apk1"; then - info "file exists: $apk1" -else - if [ ! -z "$RELEASEMANAGER" ] ; then - ./contrib/android/build.sh qml all release $password +for arch in armeabi-v7a arm64-v8a x86_64 +do + apk="Electrum-$VERSION.0-$arch-release.apk" + apk_unsigned="Electrum-$VERSION.0-$arch-release-unsigned.apk" + if test -f "dist/$apk"; then + info "file exists: $apk" else - ./contrib/android/build.sh qml all release-unsigned - mv "dist/$apk1_unsigned" "dist/$apk1" - mv "dist/$apk2_unsigned" "dist/$apk2" - mv "dist/$apk3_unsigned" "dist/$apk3" + info "file does not exists: $apk" + if [ ! -z "$RELEASEMANAGER" ] ; then + ./contrib/android/build.sh qml $arch release $password + else + ./contrib/android/build.sh qml $arch release-unsigned + mv "dist/$apk_unsigned" "dist/$apk" + fi fi -fi +done # the macos binary is built on a separate machine. # the file that needs to be copied over is the codesigned release binary (regardless of builder role)