From 21637a477f97accc2a1414b22fdb2cb41a742d5f Mon Sep 17 00:00:00 2001
From: x-tools-author <x-tools@outlook.com>
Date: Tue, 4 Mar 2025 22:18:37 +0800
Subject: [PATCH] chore: update the file

---
 .github/workflows/build-android.yml | 12 ++++++------
 .github/workflows/build-daily.yml   | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
index f223cf7e..3ef6c0b8 100644
--- a/.github/workflows/build-android.yml
+++ b/.github/workflows/build-android.yml
@@ -19,6 +19,11 @@ jobs:
       matrix:
         os: [windows-2022]
         version: [6.8.2]
+    env:
+      QT_ANDROID_KEYSTORE_PATH: ${{ github.workspace }}\res\android\android_release.keystore
+      QT_ANDROID_KEYSTORE_ALIAS: ${{ secrets.ANDROID_KEYSTORE_ALIAS }}
+      QT_ANDROID_KEYSTORE_STORE_PASS: ${{ secrets.ANDROID_KEYSTORE_STORE_PASS }}
+      QT_ANDROID_KEYSTORE_KEY_PASS: ${{ secrets.ANDROID_KEYSTORE_KEY_PASS }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -69,11 +74,6 @@ jobs:
           cmake --build build\armeabi_v7a --target all --config Release
       - name: Deploy for Android
         shell: cmd
-        env:
-          QT_ANDROID_KEYSTORE_PATH: ${{ github.workspace }}\res\android\android_release.keystore
-          QT_ANDROID_KEYSTORE_ALIAS: ${{ secrets.ANDROID_KEYSTORE_ALIAS }}
-          QT_ANDROID_KEYSTORE_STORE_PASS: ${{ secrets.ANDROID_KEYSTORE_STORE_PASS }}
-          QT_ANDROID_KEYSTORE_KEY_PASS: ${{ secrets.ANDROID_KEYSTORE_KEY_PASS }}
         run: |
           set JAVA_HOME=%JAVA_HOME_17_X64%
           echo %JAVA_HOME%
@@ -81,6 +81,6 @@ jobs:
           --input build\armeabi_v7a\android-xTools-deployment-settings.json ^
           --output build\armeabi_v7a\android-build ^
           --android-platform android-35 ^
-          --sign ${{ github.workspace }}\res\android\android_release.keystore  ${{ env.QT_ANDROID_KEYSTORE_ALIAS }} --storepass  ${{ env.QT_ANDROID_KEYSTORE_STORE_PASS }}  --keypass ${{ env.QT_ANDROID_KEYSTORE_KEY_PASS }} ^
+          --sign ${{ env.QT_ANDROID_KEYSTORE_PATH }} ${{ env.QT_ANDROID_KEYSTORE_ALIAS }} --storepass  ${{ env.QT_ANDROID_KEYSTORE_STORE_PASS }}  --keypass ${{ env.QT_ANDROID_KEYSTORE_KEY_PASS }} ^
           --jdk %JAVA_HOME% --gradle --release
 
diff --git a/.github/workflows/build-daily.yml b/.github/workflows/build-daily.yml
index f5fbf8c5..e05e8538 100644
--- a/.github/workflows/build-daily.yml
+++ b/.github/workflows/build-daily.yml
@@ -135,6 +135,11 @@ jobs:
   release-for-android:
     runs-on: windows-2022
     needs: update-release
+    env:
+      QT_ANDROID_KEYSTORE_PATH: ${{ github.workspace }}\res\android\android_release.keystore
+      QT_ANDROID_KEYSTORE_ALIAS: ${{ secrets.ANDROID_KEYSTORE_ALIAS }}
+      QT_ANDROID_KEYSTORE_STORE_PASS: ${{ secrets.ANDROID_KEYSTORE_STORE_PASS }}
+      QT_ANDROID_KEYSTORE_KEY_PASS: ${{ secrets.ANDROID_KEYSTORE_KEY_PASS }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -189,11 +194,6 @@ jobs:
             copy .\build\armeabi_v7a\libxTools_armeabi-v7a.so .\build\armeabi_v7a\android-build\libs\armeabi-v7a /y
       - name: Deploy for Android
         shell: cmd
-        env:
-          QT_ANDROID_KEYSTORE_PATH: ${{ github.workspace }}\res\android\android_release.keystore
-          QT_ANDROID_KEYSTORE_ALIAS: ${{ secrets.ANDROID_KEYSTORE_ALIAS }}
-          QT_ANDROID_KEYSTORE_STORE_PASS: ${{ secrets.ANDROID_KEYSTORE_STORE_PASS }}
-          QT_ANDROID_KEYSTORE_KEY_PASS: ${{ secrets.ANDROID_KEYSTORE_KEY_PASS }}
         run: |
           set JAVA_HOME=%JAVA_HOME_17_X64%
           echo %JAVA_HOME%
@@ -201,8 +201,8 @@ jobs:
           --input build\armeabi_v7a\android-xTools-deployment-settings.json ^
           --output build\armeabi_v7a\android-build ^
           --android-platform android-35 ^
+          --sign ${{ env.QT_ANDROID_KEYSTORE_PATH }} ${{ env.QT_ANDROID_KEYSTORE_ALIAS }} --storepass  ${{ env.QT_ANDROID_KEYSTORE_STORE_PASS }}  --keypass ${{ env.QT_ANDROID_KEYSTORE_KEY_PASS }} ^
           --jdk %JAVA_HOME% --gradle --release
-        #  --sign ${{ github.workspace }}\Resources\Platforms\Android\xTools.keystore xTools --storepass xTools --keypass xTools ^
       - name: Upload Release Asset for Android
         run: |
           cmake -E copy build/armeabi_v7a/android-build/build/outputs/apk/release/android-build-release-signed.apk xtools-android-armeabi_v7a.apk