同步主分支中的修改

.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

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 {