Fix issue in script

This commit is contained in:
Benoit Marty 2024-05-23 17:24:18 +02:00
parent 10e58b820a
commit 31fcfe3ffe

View file

@ -222,8 +222,7 @@ printf "Downloading the artifacts...\n"
python3 ./tools/github/download_all_github_artifacts.py \ python3 ./tools/github/download_all_github_artifacts.py \
--token ${gitHubToken} \ --token ${gitHubToken} \
--runUrl ${runUrl} \ --runUrl ${runUrl} \
--directory ${targetPath} \ --directory ${targetPath}
--ignoreErrors
printf "\n================================================================================\n" printf "\n================================================================================\n"
printf "Unzipping the F-Droid artifact...\n" printf "Unzipping the F-Droid artifact...\n"
@ -231,14 +230,10 @@ printf "Unzipping the F-Droid artifact...\n"
fdroidTargetPath="${targetPath}/fdroid" fdroidTargetPath="${targetPath}/fdroid"
unzip ${targetPath}/elementx-app-fdroid-apks-unsigned.zip -d ${fdroidTargetPath} unzip ${targetPath}/elementx-app-fdroid-apks-unsigned.zip -d ${fdroidTargetPath}
# Flatten folder hierarchy
mv ${fdroidTargetPath}/fdroid/release/* ${fdroidTargetPath}
rm -rf ${fdroidTargetPath}/fdroid
printf "\n================================================================================\n" printf "\n================================================================================\n"
printf "Signing the FDroid APKs...\n" printf "Signing the FDroid APKs...\n"
app-fdroid-arm64-v8a-release
cp ${fdroidTargetPath}/app-fdroid-arm64-v8a-release-unsigned.apk \ cp ${fdroidTargetPath}/app-fdroid-arm64-v8a-release.apk \
${fdroidTargetPath}/app-fdroid-arm64-v8a-release-signed.apk ${fdroidTargetPath}/app-fdroid-arm64-v8a-release-signed.apk
${buildToolsPath}/apksigner sign \ ${buildToolsPath}/apksigner sign \
-v \ -v \
@ -249,7 +244,7 @@ ${buildToolsPath}/apksigner sign \
--min-sdk-version ${minSdkVersion} \ --min-sdk-version ${minSdkVersion} \
${fdroidTargetPath}/app-fdroid-arm64-v8a-release-signed.apk ${fdroidTargetPath}/app-fdroid-arm64-v8a-release-signed.apk
cp ${fdroidTargetPath}/app-fdroid-armeabi-v7a-release-unsigned.apk \ cp ${fdroidTargetPath}/app-fdroid-armeabi-v7a-release.apk \
${fdroidTargetPath}/app-fdroid-armeabi-v7a-release-signed.apk ${fdroidTargetPath}/app-fdroid-armeabi-v7a-release-signed.apk
${buildToolsPath}/apksigner sign \ ${buildToolsPath}/apksigner sign \
-v \ -v \
@ -260,7 +255,7 @@ ${buildToolsPath}/apksigner sign \
--min-sdk-version ${minSdkVersion} \ --min-sdk-version ${minSdkVersion} \
${fdroidTargetPath}/app-fdroid-armeabi-v7a-release-signed.apk ${fdroidTargetPath}/app-fdroid-armeabi-v7a-release-signed.apk
cp ${fdroidTargetPath}/app-fdroid-x86-release-unsigned.apk \ cp ${fdroidTargetPath}/app-fdroid-x86-release.apk \
${fdroidTargetPath}/app-fdroid-x86-release-signed.apk ${fdroidTargetPath}/app-fdroid-x86-release-signed.apk
${buildToolsPath}/apksigner sign \ ${buildToolsPath}/apksigner sign \
-v \ -v \
@ -271,7 +266,7 @@ ${buildToolsPath}/apksigner sign \
--min-sdk-version ${minSdkVersion} \ --min-sdk-version ${minSdkVersion} \
${fdroidTargetPath}/app-fdroid-x86-release-signed.apk ${fdroidTargetPath}/app-fdroid-x86-release-signed.apk
cp ${fdroidTargetPath}/app-fdroid-x86_64-release-unsigned.apk \ cp ${fdroidTargetPath}/app-fdroid-x86_64-release.apk \
${fdroidTargetPath}/app-fdroid-x86_64-release-signed.apk ${fdroidTargetPath}/app-fdroid-x86_64-release-signed.apk
${buildToolsPath}/apksigner sign \ ${buildToolsPath}/apksigner sign \
-v \ -v \