From aca63e688cd7d5db17b9a788b000bbfada8ebbfb Mon Sep 17 00:00:00 2001
From: TonyJiangWJ <tonyjiangwj@gmail.com>
Date: Fri, 25 Aug 2023 00:24:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=B8=BB=E5=88=86=E6=94=AF?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/android.yml |  8 ++++----
 app/build.gradle              | 24 ++++++++++++++++--------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 4ffc777e..5d458d1a 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches: [ "fake_idlefish" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "fake_idlefish" ]
 
 jobs:
   build:
@@ -15,7 +15,7 @@ jobs:
     - name: set up JDK 20
       uses: actions/setup-java@v3
       with:
-        java-version: '20'
+        java-version: '11'
         distribution: 'temurin'
         cache: gradle
 
@@ -29,7 +29,7 @@ jobs:
       uses: actions/upload-artifact@v3
       with:
         name: release-arm64-apk
-        path: app/build/outputs/apk/release/*arm64-v8a.apk
+        path: app/build/outputs/apk/release/*arm64-v8a*.apk
       continue-on-error: true
 
     - name: Upload armv7 artifacts
@@ -37,5 +37,5 @@ jobs:
       uses: actions/upload-artifact@v3
       with:
         name: release-armv7-apk
-        path: app/build/outputs/apk/release/*-v7a.apk
+        path: app/build/outputs/apk/release/*-v7a*.apk
       continue-on-error: true
diff --git a/app/build.gradle b/app/build.gradle
index 8c52d3bf..ada521ea 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,15 +11,18 @@ def homePath = System.properties['user.home']
 def storePasswd = System.getenv('autojspasswd')
 def keyPasswd = System.getenv('autojspasswd')
 def alias = System.getenv('autojsalias')
-
+def signSupport = false
 
 android {
     signingConfigs {
-        release {
-            storeFile file(homePath + '/auto-js-t-pkcs12.jks')
-            storePassword storePasswd
-            keyPassword keyPasswd
-            keyAlias = alias
+        if (file(homePath + '/auto-js-t-pkcs12.jks').exists()) {
+            signSupport = true
+            release {
+                storeFile file(homePath + '/auto-js-t-pkcs12.jks')
+                storePassword storePasswd
+                keyPassword keyPasswd
+                keyAlias = alias
+            }
         }
         debug {
             storeFile file('debug/autojs-pkcs12-debug.jks')
@@ -60,8 +63,13 @@ android {
             shrinkResources false
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.release
-            applicationIdSuffix ".x"
+            applicationIdSuffix ".modify"
+        }
+        if (signSupport) {
+            println('sign support')
+            release.signingConfig = signingConfigs.release
+        } else {
+            println('sign is not support')
         }
     }
     compileOptions {