fix CI builds

NextAlone · Dec 2, 2022 · f56b39d · f56b39d
1 parent 8c043db
commit f56b39d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml
@@ -409,6 +409,16 @@ jobs:
           path: |
             TMessagesProj/libs/libv2ray.aar
           key: ${{ hashFiles('bin/libs/v2ray/*', 'v2ray_status') }}
+      - name: Build Cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            TMessagesProj/build
+            TMessagesProj/.cxx
+            ss-rust/build
+            ssr-rust/build
+            openpgp-api/build
+          key: build-cache
       - name: Configure Gradle
         run: |
           sed -i -e "s/16384/6144/g" gradle.properties
@@ -439,7 +449,7 @@ jobs:
           curl http://127.0.0.1:8081/ || start
           curl http://127.0.0.1:8081/ || start
           curl http://127.0.0.1:8081/ || start
-          apk=$(find TMessagesProj/build/outputs/apk/mini/release -name '*arm64-v8a*.apk' | head -n 1)
+          apk=$(find TMessagesProj/build/outputs/apk/mini/release -name 'NekoX*.apk' | head -n 1)
           curl http://127.0.0.1:8081/bot${{ secrets.HELPER_BOT_TOKEN }}/sendDocument \
             -X POST \
             -F chat_id="${{ secrets.HELPER_BOT_TARGET }}" \

diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle
@@ -7,7 +7,7 @@ def verName = "9.1.6-preview01"
 def verCode = 670
 
 if (System.getenv("DEBUG_BUILD") == "true") {
-    verName += "-" + RuntimeUtil.execForStr("git log --pretty=format:'%h' -n 1").trim()
+    verName += "-" + RuntimeUtil.execForStr("git log --pretty=format:'%h' -n 1").trim().replace('\'','')
 }
 
 def officialVer = "9.1.6"
@@ -85,12 +85,13 @@ android {
                 enable false
                 universalApk true
             } else {
-                enable true
                 if (!nativeTarget.isBlank()) {
+                    enable false
+                    universalApk false
                     reset()
                     include nativeTarget
-                    universalApk false
                 } else {
+                    enable false
                     universalApk true
                 }
             }