From ba9f84efee5c3c83ab3a786c7e392374b27c6ee5 Mon Sep 17 00:00:00 2001
From: luvletter2333 <luvletter2333@gmail.com>
Date: Fri, 4 Feb 2022 21:57:35 +0800
Subject: [PATCH] Fix release CI

---
 .github/workflows/release.yml    | 9 +++++----
 TMessagesProj/build.gradle       | 2 +-
 TMessagesProj/jni/CMakeLists.txt | 5 -----
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 42cfa3ae6..a60285f7b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -115,9 +115,8 @@ jobs:
         uses: actions/cache@v2
         with:
           path: |
-            TMessagesProj/jni/ffmpeg/build
-            TMessagesProj/jni/libvpx/build
-          key: ${{ hashFiles('ffmpeg_status', 'libvpx_status', 'TMessagesProj/jni/*ffmpeg*.sh', 'TMessagesProj/jni/*libvpx*.sh') }}
+            TMessagesProj/src/main/libs
+          key: ${{ hashFiles('TMessagesProj/jni/**', 'ffmpeg_status', 'boringssl_status') }}-${{ matrix.flavor }}
       - name: Checkout Library
         if: steps.cache.outputs.cache-hit != 'true'
         run: |
@@ -128,7 +127,8 @@ jobs:
         with:
           path: |
             TMessagesProj/jni/ffmpeg/build
-          key: ${{ hashFiles('ffmpeg_status', 'TMessagesProj/jni/*_ffmpeg.sh') }}
+            TMessagesProj/jni/libvpx/build
+          key: ${{ hashFiles('ffmpeg_status', 'libvpx_status', 'TMessagesProj/jni/*ffmpeg*.sh', 'TMessagesProj/jni/*libvpx*.sh') }}
       - name: BoringSSL Cache
         uses: actions/cache@v2
         if: steps.cache.outputs.cache-hit != 'true'
@@ -393,6 +393,7 @@ jobs:
                 -F chat_id="${{ secrets.TELEGRAM_CHANNEL }}" \
                 -F document="@$apk" \
                 --silent --show-error --fail >/dev/null
+              sleep 1
             done
           }
           upload apks/NekoX-*-mini-*-release.apk
diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle
index c2a2ef74d..c8b515661 100644
--- a/TMessagesProj/build.gradle
+++ b/TMessagesProj/build.gradle
@@ -4,7 +4,7 @@ apply plugin: "com.android.application"
 apply plugin: "kotlin-android"
 
 def verName = "8.5.1-preview01"
-def verCode = 560
+def verCode = 565
 
 if (System.getenv("DEBUG_BUILD") == "true") {
     verName += "-" + RuntimeUtil.execForStr("git log --pretty=format:'%h' -n 1").trim()
diff --git a/TMessagesProj/jni/CMakeLists.txt b/TMessagesProj/jni/CMakeLists.txt
index 3825a097e..e6365f257 100644
--- a/TMessagesProj/jni/CMakeLists.txt
+++ b/TMessagesProj/jni/CMakeLists.txt
@@ -762,11 +762,6 @@ target_link_libraries(${NATIVE_LIB}
         OpenSLES
         cpufeatures)
 
-#if (${ANDROID_ABI} STREQUAL "x86" OR ${ANDROID_ABI} STREQUAL "x86_64")
-#    target_link_libraries(${NATIVE_LIB}
-#            -Wl,--whole-archive vpxasm -Wl,--no-whole-archive
-#            c)
-#endif()
 
 include(AndroidNdkModules)
 android_ndk_import_module_cpufeatures()
\ No newline at end of file