From 04da9abd3132854279da22f8c4df52bb532362d4 Mon Sep 17 00:00:00 2001
From: CI Bot <ci@local>
Date: Tue, 2 Jun 2026 21:39:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BC=BA=E5=88=B6=E4=BD=BF=E7=94=A8=20J?=
 =?UTF-8?q?ava=2017?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/android-release.yml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/.gitea/workflows/android-release.yml b/.gitea/workflows/android-release.yml
index 72639d8..b39b943 100644
--- a/.gitea/workflows/android-release.yml
+++ b/.gitea/workflows/android-release.yml
@@ -5,6 +5,9 @@ on:
     tags:
       - 'v*'
 
+env:
+  JAVA_HOME: /usr/lib/jvm/java-17-openjdk
+
 jobs:
   release:
     runs-on: android
@@ -13,10 +16,10 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
 
-    - name: Setup Java 17
+    - name: Verify Java
       run: |
-        export JAVA_HOME=/usr/lib/jvm/java-17-openjdk
-        export PATH=$JAVA_HOME/bin:$PATH
+        echo "JAVA_HOME=$JAVA_HOME"
+        which java
         java -version
 
     - name: Setup Keystore
@@ -37,14 +40,14 @@ jobs:
     - name: Build Signed APK
       env:
         KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
-        KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+        KEY_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
         KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
       run: |
         export ANDROID_HOME=/opt/android-sdk
         export PATH=$ANDROID_HOME/cmdline-tools/latest/bin:$PATH
+        java -version
         gradle assembleRelease --no-daemon --stacktrace
         VERSION=${GITHUB_REF#refs/tags/}
-        cp app/build/outputs/apk/release/app-release.apk app/build/outputs/apk/release/app-${VERSION}-signed.apk
         echo "APK_NAME=app-${VERSION}-signed.apk" >> $GITHUB_ENV
 
     - name: Create Release