From f56b39d56d2ef8489b06a26c57849ded84da2612 Mon Sep 17 00:00:00 2001
From: luvletter2333 <luvletter2333@gmail.com>
Date: Sat, 3 Dec 2022 02:03:28 +0800
Subject: [PATCH] fix CI builds

---
 .github/workflows/debug.yml | 12 +++++++++++-
 TMessagesProj/build.gradle  |  7 ++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml
index 2802a7cf3a..729245da1b 100644
--- 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
index 5394c60767..a7eb827188 100644
--- 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
                 }
             }