Merge branch 'beta' of github.com:Muhammed-Rahif/Islam into beta

Muhammed-Rahif · Apr 10, 2023 · b2fc970 · b2fc970
2 parents 27f11a8 + 5c43bd6
commit b2fc970
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,6 +14,8 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v2
       - name: Setup node environment
         uses: actions/setup-node@v3
         with:
@@ -29,5 +31,8 @@ jobs:
           TELEGRAM_BOT_ID: ${{ secrets.TELEGRAM_BOT_ID }}
           TELEGRAM_BOT_TOKEN: ${{ secrets.TELEGRAM_BOT_TOKEN }}
           TELEGRAM_BOT_API_KEY: ${{ secrets.TELEGRAM_BOT_API_KEY }}
+          KEYSTORE_ALIAS: ${{ secrets.KEYSTORE_ALIAS }}
+          KEYSTORE_FILE_BASE64: ${{ secrets.KEYSTORE_FILE_BASE64 }}
+          KEYSTORE_PASS: ${{ secrets.KEYSTORE_PASS }}
         run: |
           yarn semantic-release
diff --git a/scripts/build/build-android.sh b/scripts/build/build-android.sh
@@ -8,8 +8,7 @@ cd android
 chmod +x gradlew
 ./gradlew assembleDebug
 ./gradlew assembleRelease
-cd ../
-echo $KEYSTORE_FILE_BASE64 | base64 --decode > release-key.keystore
-jarsigner -keystore release-key.keystore app/build/outputs/apk/release/app-release-unsigned.apk $KEYSTORE_ALIAS -storepass $KEYSTORE_PASS
-zipalign 4 app/build/outputs/apk/release/app-release-unsigned.apk app/build/outputs/apk/release/app-release.apk
+echo "$KEYSTORE_FILE_BASE64" | base64 --decode > release-key.keystore
+$ANDROID_HOME/build-tools/30.0.3/zipalign -v 4 app/build/outputs/apk/release/app-release-unsigned.apk app/build/outputs/apk/release/app-release.apk
+$ANDROID_HOME/build-tools/30.0.3/apksigner sign --ks release-key.keystore --ks-key-alias $KEYSTORE_ALIAS --ks-pass pass:$KEYSTORE_PASS app/build/outputs/apk/release/app-release.apk 
 cd ../
diff --git a/scripts/telegram-bot/success-release.ts b/scripts/telegram-bot/success-release.ts
@@ -59,7 +59,7 @@ We encourage all developers, testers, and users to <a href="${downloadUrl}">down
   });
 
   await bot.telegram.sendDocument(toTelegramId, {
-    source: `android/app/build/outputs/apk/debug/app-release.apk`,
+    source: `android/app/build/outputs/apk/release/app-release.apk`,
     filename: `app-release-${versionName}.apk`,
   });