Update script

SteveZMTstudios · web-flow · commit 78c493a850aa · 2025-09-20T10:48:24.000+08:00
diff --git a/.github/workflows/android-build-release.yml b/.github/workflows/android-build-release.yml
@@ -49,32 +49,80 @@ jobs:
           # Set JVM max heap via GRADLE_OPTS to avoid shell/PowerShell parsing issues with -Porg.gradle.jvmargs
           GRADLE_OPTS="-Xmx3g" ./gradlew assembleDebug
 
+      - name: Decode keystore (if provided)
+        shell: bash
+        env:
+          RELEASE_KEYSTORE_BASE64: ${{ secrets.RELEASE_KEYSTORE_BASE64 }}
+        run: |
+          set -euo pipefail
+          if [ -n "${RELEASE_KEYSTORE_BASE64:-}" ]; then
+            mkdir -p app/release
+            echo "$RELEASE_KEYSTORE_BASE64" | base64 --decode > app/release/release-keystore.jks
+            ls -l app/release/release-keystore.jks
+          else
+            echo "RELEASE_KEYSTORE_BASE64 not set; skipping keystore decode"
+          fi
+
       - name: Build Release APK
+        env:
+          RELEASE_KEYSTORE_BASE64: ${{ secrets.RELEASE_KEYSTORE_BASE64 }}
+          RELEASE_KEYSTORE_KEY: ${{ secrets.RELEASE_KEYSTORE_KEY }}
+          RELEASE_KEYSTORE_SUBKEY: ${{ secrets.RELEASE_KEYSTORE_SUBKEY }}
         run: |
+          set -euo pipefail
           # Set JVM max heap via GRADLE_OPTS to avoid shell/PowerShell parsing issues with -Porg.gradle.jvmargs
-          GRADLE_OPTS="-Xmx3g" ./gradlew assembleRelease
+          GRADLE_OPTS="-Xmx3g"
+
+          # If keystore secret is present but file missing, decode it now (defensive)
+          if [ -n "${RELEASE_KEYSTORE_BASE64:-}" ] && [ ! -f app/release/release-keystore.jks ]; then
+            mkdir -p app/release
+            echo "$RELEASE_KEYSTORE_BASE64" | base64 --decode > app/release/release-keystore.jks
+            chmod 600 app/release/release-keystore.jks
+          fi
+
+          # Build with signing properties if keystore exists and passwords provided
+          if [ -f app/release/release-keystore.jks ] && [ -n "${RELEASE_KEYSTORE_KEY:-}" ] && [ -n "${RELEASE_KEYSTORE_SUBKEY:-}" ]; then
+            echo "Keystore found — building signed release APK"
+            ./gradlew assembleRelease -Pandroid.injected.signing.store.file=app/release/release-keystore.jks -Pandroid.injected.signing.store.password="${RELEASE_KEYSTORE_KEY}" -Pandroid.injected.signing.key.password="${RELEASE_KEYSTORE_SUBKEY}" -Pandroid.injected.signing.key.alias=release
+          else
+            echo "No keystore/passwords provided — building release APK without injected signing properties"
+            ./gradlew assembleRelease
+          fi
 
       - name: Prepare artifacts
         run: |
+          set -euo pipefail
           mkdir -p release_artifacts
-          # Paths from the repo
+          # Standard apk paths
           DEBUG_APK=app/build/outputs/apk/debug/app-debug.apk
-          RELEASE_APK=app/release/app-release.apk
-          # Copy the same APK to ABI-labeled files. If your project generates ABI-specific APKs, replace these with the real files.
+          RELEASE_APK=app/build/outputs/apk/release/app-release.apk
+          RELEASE_APK_UNSIGN=app/build/outputs/apk/release/app-release-unsigned.apk
+
+
+          COPIED=0
           if [ -f "$DEBUG_APK" ]; then
-            cp "$DEBUG_APK" release_artifacts/app-debug-universe.apk
-            cp "$DEBUG_APK" release_artifacts/app-debug-arm.apk
-            cp "$DEBUG_APK" release_artifacts/app-debug-arm64.apk
+            cp "$DEBUG_APK" release_artifacts/app-debug.apk
+            COPIED=$((COPIED+1))
           else
-            echo "Debug APK not found at $DEBUG_APK" && ls -R app/build/outputs || exit 1
+            echo "Debug APK not found at $DEBUG_APK"
           fi
 
           if [ -f "$RELEASE_APK" ]; then
-            cp "$RELEASE_APK" release_artifacts/app-release-universe.apk
-            cp "$RELEASE_APK" release_artifacts/app-release-arm.apk
-            cp "$RELEASE_APK" release_artifacts/app-release-arm64.apk
+            cp "$RELEASE_APK" release_artifacts/app-release.apk
+            COPIED=$((COPIED+1))
           else
-            echo "Release APK not found at $RELEASE_APK" && ls -R app || exit 1
+            echo "Release APK not found at $RELEASE_APK"
+            if [ -f "$RELEASE_APK" ]; then
+              cp "$RELEASE_APK_UNSIGN" release_artifacts/app-release.apk
+              COPIED=$((COPIED+1))
+            else
+              echo "Release APK not found at $RELEASE_APK_UNSIGN"
+            fi
+          fi
+
+          if [ $COPIED -ne 2 ]; then
+            echo "Missing apk. Listing outputs for debugging:"
+            ls -R app/build || true
           fi
 
       - name: Create GitHub Release (use Gradle version, commit history and commit id)
@@ -84,7 +132,6 @@ jobs:
         run: |
           set -euo pipefail
 
-          # 1) 获取版本号（优先：app/build.gradle -> app/build.gradle.kts -> gradle.properties）
           VERSION=""
           if [ -f app/build.gradle ]; then
             VERSION=$(grep -m1 "versionName" app/build.gradle | sed -E "s/.*versionName[[:space:]]+['\"]([^'\"]+)['\"].*/\1/" || true)
@@ -97,31 +144,25 @@ jobs:
           fi
           VERSION=${VERSION:-"build-${GITHUB_RUN_ID}"}
 
-          # 2) commit id（短 sha）和 commit history 作为 body
           COMMIT_ID=$(git rev-parse --short HEAD)
           BODY=$(git log --pretty=format:"%h %ad - %s (%an)" --date=short --no-merges -n 200)
 
-          # 3) 构造 JSON payload（使用 jq 确保正确的 JSON 转义）
           if ! command -v jq >/dev/null 2>&1; then
             echo "jq is required but not installed in runner. Exiting."
             exit 1
           fi
           PAYLOAD=$(jq -n --arg tag "${COMMIT_ID}" --arg name "${VERSION}" --arg body "${BODY}" \
             '{ tag_name: $tag, name: $name, body: $body, draft: false, prerelease: false }')
 
-          # 4) 调用 GitHub Releases API 创建 release（创建时为最新）
           RESPONSE=$(curl -s -X POST \
             -H "Authorization: token ${GITHUB_TOKEN}" \
             -H "Accept: application/vnd.github+json" \
             -H "Content-Type: application/json" \
             -d "${PAYLOAD}" \
             "https://api.github.com/repos/${GITHUB_REPOSITORY}/releases")
-
-          # 输出响应以便日志可见
           echo "GitHub release response:"
           echo "${RESPONSE}" | jq .
 
-          # 5) 从响应中取 upload_url 并导出为步骤输出，供后续 upload-release-asset 使用
           UPLOAD_URL=$(echo "${RESPONSE}" | jq -r '.upload_url // empty')
           if [ -z "$UPLOAD_URL" ] || [ "$UPLOAD_URL" = "null" ]; then
             echo "Failed to create release or upload_url missing. Full response above."
@@ -132,50 +173,18 @@ jobs:
       - name: Skip turnstyle (not required)
         run: echo "Skipping turnstyle wrapper; uploading directly using upload-release-asset"
 
-      - name: Upload APKs to release
-        uses: actions/upload-release-asset@v1
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: release_artifacts/app-debug-arm.apk
-          asset_name: app-debug-arm.apk
-          asset_content_type: application/vnd.android.package-archive
-
-      - name: Upload APKs to release (arm64)
-        uses: actions/upload-release-asset@v1
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: release_artifacts/app-debug-arm64.apk
-          asset_name: app-debug-arm64.apk
-          asset_content_type: application/vnd.android.package-archive
-
-      - name: Upload APKs to release (universe debug)
-        uses: actions/upload-release-asset@v1
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: release_artifacts/app-debug-universe.apk
-          asset_name: app-debug-universe.apk
-          asset_content_type: application/vnd.android.package-archive
-
-      - name: Upload Release APKs (arm)
-        uses: actions/upload-release-asset@v1
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: release_artifacts/app-release-arm.apk
-          asset_name: app-release-arm.apk
-          asset_content_type: application/vnd.android.package-archive
-
-      - name: Upload Release APKs (arm64)
+      - name: Upload Debug APK to release
         uses: actions/upload-release-asset@v1
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: release_artifacts/app-release-arm64.apk
-          asset_name: app-release-arm64.apk
+          asset_path: release_artifacts/app-debug.apk
+          asset_name: app-debug.apk
           asset_content_type: application/vnd.android.package-archive
 
-      - name: Upload Release APKs (universe)
+      - name: Upload Release APK to release
         uses: actions/upload-release-asset@v1
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: release_artifacts/app-release-universe.apk
-          asset_name: app-release-universe.apk
+          asset_path: release_artifacts/app-release.apk
+          asset_name: app-release.apk
           asset_content_type: application/vnd.android.package-archive
