From ac0f655be6329346a1b640727cc3bd82b1b0e44d Mon Sep 17 00:00:00 2001
From: Benoit Lavenier <benoit.lavenier@e-is.pro>
Date: Thu, 11 May 2023 16:54:33 +0200
Subject: [PATCH] [fix] Fix Release scripts
---
scripts/build-android.sh | 8 ++++----
scripts/env-global.sh | 2 +-
scripts/install-android-sdk-tools.sh | 2 +-
scripts/release-android.sh | 7 +------
scripts/release-to-github.sh | 8 ++++++--
scripts/release.sh | 2 +-
6 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/scripts/build-android.sh b/scripts/build-android.sh
index fc828e61c..5efa2b5e8 100755
--- a/scripts/build-android.sh
+++ b/scripts/build-android.sh
@@ -22,9 +22,9 @@ fi
# Run the build
echo "Cleaning previous android APK files..."
-rm -rf ${ANDROID_OUTPUT_APK_DEBUG}/*.apk
-rm -rf ${ANDROID_OUTPUT_APK_RELEASE}/*.apk
+rm -f ${ANDROID_OUTPUT_APK_DEBUG}/*.apk
+rm -f ${ANDROID_OUTPUT_APK_RELEASE}/*.apk*
echo "Running cordova build android..."
-ionic cordova build android --warning-mode=none --color $*
-#ionic cordova build android --warning-mode=none --color --verbose
+ionic cordova build android --warning-mode=none --color $* -- -- --packageType=apk
+#ionic cordova build android --warning-mode=none --color --verbose -- -- --packageType=apk
diff --git a/scripts/env-global.sh b/scripts/env-global.sh
index 9064c6b27..c5cd614ad 100755
--- a/scripts/env-global.sh
+++ b/scripts/env-global.sh
@@ -25,7 +25,7 @@ NODEJS_VERSION=16
IONIC_CLI_VERSION=6.20.9
ANDROID_NDK_VERSION=21.0.6113669 # Should be compatible with 'cordova-sqlite-storage' plugin
-ANDROID_SDK_VERSION=32.0.0
+ANDROID_SDK_VERSION=33.0.2
ANDROID_SDK_CLI_VERSION=8512546 # See https://developer.android.com/studio#command-tools
ANDROID_SDK_ROOT="${HOME}/Android/Sdk"
ANDROID_ALTERNATIVE_SDK_ROOT=/usr/lib/android-sdk
diff --git a/scripts/install-android-sdk-tools.sh b/scripts/install-android-sdk-tools.sh
index c0a10c7dd..0f280c086 100755
--- a/scripts/install-android-sdk-tools.sh
+++ b/scripts/install-android-sdk-tools.sh
@@ -41,7 +41,7 @@ mkdir -p ~/.android
touch ~/.android/repositories.cfg
echo y | sdkmanager "platform-tools" "--sdk_root=${ANDROID_SDK_ROOT}" | tee sdkmanager.log
-echo y | sdkmanager "extras;android;m2repository" "--sdk_root=${ANDROID_SDK_ROOT}" | tee -a sdkmanager.log
+echo y | sdkmanager "extras;android;m2repository" "--sdk_root=${ANDROID_SDK_ROOT}" | tee -a sdkmanager.log
echo y | sdkmanager "extras;google;m2repository" "--sdk_root=${ANDROID_SDK_ROOT}" | tee -a sdkmanager.log
echo y | sdkmanager "cmdline-tools;latest" "--sdk_root=${ANDROID_SDK_ROOT}" | tee sdkmanager.log
diff --git a/scripts/release-android.sh b/scripts/release-android.sh
index d6ae2c9ca..406f8fa2d 100755
--- a/scripts/release-android.sh
+++ b/scripts/release-android.sh
@@ -20,12 +20,7 @@ APK_SIGNED_FILE=${ANDROID_OUTPUT_APK_RELEASE}/${ANDROID_OUTPUT_APK_PREFIX}-relea
APK_UNSIGNED_FILE=${ANDROID_OUTPUT_APK_RELEASE}/${ANDROID_OUTPUT_APK_PREFIX}-release-unsigned.apk
echo "--- Cleaning previous Android APK ..."
-if [[ -f "${APK_SIGNED_FILE}" ]]; then
- rm -f ${APK_SIGNED_FILE}*
-fi;
-if [[ -f "${APK_UNSIGNED_FILE}" ]]; then
- rm -f ${APK_UNSIGNED_FILE}
-fi;
+rm -f ${ANDROID_OUTPUT_APK_RELEASE}/*.apk*
echo "--- Cleaning previous Android APK [OK]"
echo ""
diff --git a/scripts/release-to-github.sh b/scripts/release-to-github.sh
index ad137cf51..deae93436 100755
--- a/scripts/release-to-github.sh
+++ b/scripts/release-to-github.sh
@@ -157,11 +157,15 @@ fi
# Upload Android APK file
APK_BASENAME="${PROJECT_NAME}-v${current}-android.apk"
-APK_FILE="${DIST_ANDROID}/${APK_BASENAME}"
+APK_FILE="${ANDROID_OUTPUT_APK_RELEASE}/${ANDROID_OUTPUT_APK_PREFIX}-release-signed.apk"
if [[ -f "${APK_FILE}" ]]; then
+ # Copy to dist/android
+ mkdir -p ${DIST_ANDROID}
+ cp -f "${APK_FILE}" "${DIST_ANDROID}/${APK_BASENAME}"
+
result=$(curl -s -H ''"$GITHUT_AUTH"'' -H 'Content-Type: application/vnd.android.package-archive' -T "${APK_FILE}" "${upload_url}?name=${APK_BASENAME}")
browser_download_url=$(echo "$result" | grep -P "\"browser_download_url\":[ ]?\"[^\"]+" | grep -oP "\"browser_download_url\":[ ]?\"[^\"]+" | grep -oP "https://[A-Za-z0-9/.-]+")
- APK_SHA256=$(cd ${DIST_ANDROID} && sha256sum "${APK_BASENAME}")
+ APK_SHA256=$(sha256sum "${APK_FILE}" | sed 's/ /\n/gi' | head -n 1)
echo " - ${browser_download_url} | SHA256 Checksum: ${APK_SHA256}"
echo "${APK_SHA256} ${APK_BASENAME}" > "${APK_FILE}.sha256"
result=$(curl -s -H ''"$GITHUT_AUTH"'' -H 'Content-Type: text/plain' -T "${APK_FILE}.sha256" "${upload_url}?name=${APK_BASENAME}.sha256")
diff --git a/scripts/release.sh b/scripts/release.sh
index 05d96adf3..15b605e33 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -148,7 +148,7 @@ echo "----------------------------------"
echo "- Uploading web extension to Mozilla ..."
echo "----------------------------------"
. ${PROJECT_DIR}/scripts/release-sign-extension.sh $1
-# FIXME: always failed: but continue
+# FIXME: always failed, but continue
#[[ $? -ne 0 ]] && exit 1
echo "----------------------------------"
--
GitLab