[fix] Fix release scripts

scripts/env-global.sh

@@ -25,7 +25,8 @@ ANDROID_OUTPUT_APK=${PROJECT_DIR}/platforms/android/build/outputs/apk
 ANDROID_OUTPUT_APK_DEBUG=${ANDROID_OUTPUT_APK}/debug
 ANDROID_OUTPUT_APK_RELEASE=${ANDROID_OUTPUT_APK}/release
 
-WEB_OUTPUT=${PROJECT_DIR}/dist/web/build
+DIST_WEB=${PROJECT_DIR}/dist/web/build
+DIST_ANDROID=${PROJECT_DIR}/dist/android
 
 #JAVA_HOME=
 

scripts/github.sh

@@ -101,24 +101,23 @@ case "$1" in
       echo "Uploading files to ${upload_url} ..."
       dirname=$(pwd)
 
-      ZIP_FILE="${WEB_OUTPUT}/${PROJECT_NAME}-v$current-web.zip"
+      ZIP_BASENAME="${PROJECT_NAME}-v$current-web.zip"
+      ZIP_FILE="${DIST_WEB}/${ZIP_BASENAME}"
       if [[ -f "${ZIP_FILE}" ]]; then
-        result=$(curl -s -H ''"$GITHUT_AUTH"'' -H 'Content-Type: application/zip' -T "${ZIP_FILE}" "${upload_url}?name=${PROJECT_NAME}-v${current}-web.zip")
+        result=$(curl -s -H ''"$GITHUT_AUTH"'' -H 'Content-Type: application/zip' -T "${ZIP_FILE}" "${upload_url}?name=${ZIP_BASENAME}")
         browser_download_url=$(echo "$result" | grep -P "\"browser_download_url\":[ ]?\"[^\"]+" | grep -oP "\"browser_download_url\":[ ]?\"[^\"]+"  | grep -oP "https://[A-Za-z0-9/.-]+")
-        ZIP_SHA256=$(sha256sum "${ZIP_FILE}")
+        ZIP_SHA256=$(cd ${WEB_OUTPUT} && sha256sum "${PROJECT_NAME}-v${current}-web.zip")
         echo " - ${browser_download_url}  | Checksum: ${ZIP_SHA256}"
       else
         echo " - ERROR: Web release (ZIP) not found! Skipping."
       fi
 
-      APK_FILE="${ANDROID_OUTPUT_APK_RELEASE}/android-release.apk"
+      APK_BASENAME="${PROJECT_NAME}-v${current}-android.apk"
+      APK_FILE="${DIST_ANDROID}/${APK_BASENAME}"
       if [[ -f "${APK_FILE}" ]]; then
-        mkdir -p ${PROJECT_DIR}/dist/android
-        cp ${APK_FILE} ${PROJECT_DIR}/dist/android/${PROJECT_NAME}-v${current}-android.apk
-        APK_FILE="${PROJECT_DIR}/dist/android/${PROJECT_NAME}-v${current}-android.apk"
-        result=$(curl -s -H ''"$GITHUT_AUTH"'' -H 'Content-Type: application/vnd.android.package-archive' -T "${APK_FILE}" "${upload_url}")
+        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=$(sha256sum "${APK_FILE}")
+        APK_SHA256=$(cd ${DIST_ANDROID} && sha256sum "${APK_BASENAME}")
         echo " - ${browser_download_url}  | Checksum: ${APK_SHA256}"
       else
         echo "- ERROR: Android release (APK) not found! Skipping."

scripts/release.sh

@@ -90,7 +90,11 @@ echo "----------------------------------"
 if [[ $? -ne 0 ]]; then
   exit 1
 fi
-
+APK_RELEASE_FILE="${ANDROID_OUTPUT_APK_RELEASE}/android-release.apk"
+if [[ -f "${APK_RELEASE_FILE}" ]]; then
+  mkdir -p ${DIST_ANDROID}
+  cp ${APK_RELEASE_FILE} ${DIST_ANDROID}/${PROJECT_NAME}-v${current}-android.apk
+fi;
 
 echo "----------------------------------"
 echo "- Building web artifact..."
@@ -117,14 +121,17 @@ if [[ $? -ne 0 ]]; then
 fi
 
 # Commit android project
-cd ${PROJECT_DIR}/platforms/android
-git reset HEAD
-git add -A
-git commit -m "v$2" && git tag "v$2" && git push
-if [[ $? -ne 0 ]]; then
-  exit 1
-fi
+#cd ${PROJECT_DIR}/platforms/android
+#git reset HEAD
+#git add -A
+#git commit -m "v$2" && git tag "v$2" && git push
+#if [[ $? -ne 0 ]]; then
+#  exit 1
+#fi
 
+echo "**********************************"
+echo "* Uploading artifacts to Github..."
+echo "**********************************"
 # Pause (wait propagation to from git.duniter.org to github)
 echo " Waiting 40s, for propagation to github..."
 sleep 40s
@@ -134,10 +141,6 @@ if [[ "_$description" == "_" ]]; then
    description="Release v$2"
 fi
 
-echo "**********************************"
-echo "* Uploading artifacts to Github..."
-echo "**********************************"
-
 ./github.sh $1 ''"$description"''
 if [[ $? -ne 0 ]]; then
     exit 1