MGislv/NekoX
1
0
Fork 0
mirror of https://github.com/MGislv/NekoX.git synced 2024-07-02 10:33:36 +00:00
Code Releases Activity

Fix release CI

Browse Source
This commit is contained in:
luvletter2333 2022-02-04 21:57:35 +08:00
parent 62c7c8b5cf
commit ba9f84efee
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.github/workflows/release.yml vendored
View File

@ -115,9 +115,8 @@ jobs:
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: | path: |
TMessagesProj/jni/ffmpeg/build TMessagesProj/src/main/libs
TMessagesProj/jni/libvpx/build key: ${{ hashFiles('TMessagesProj/jni/**', 'ffmpeg_status', 'boringssl_status') }}-${{ matrix.flavor }}
key: ${{ hashFiles('ffmpeg_status', 'libvpx_status', 'TMessagesProj/jni/*ffmpeg*.sh', 'TMessagesProj/jni/*libvpx*.sh') }}
- name: Checkout Library - name: Checkout Library
if: steps.cache.outputs.cache-hit != 'true' if: steps.cache.outputs.cache-hit != 'true'
run: | run: |
@ -128,7 +127,8 @@ jobs:
with: with:
path: | path: |
TMessagesProj/jni/ffmpeg/build 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 - name: BoringSSL Cache
uses: actions/cache@v2 uses: actions/cache@v2
if: steps.cache.outputs.cache-hit != 'true' if: steps.cache.outputs.cache-hit != 'true'
@ -393,6 +393,7 @@ jobs:
-F chat_id="${{ secrets.TELEGRAM_CHANNEL }}" \ -F chat_id="${{ secrets.TELEGRAM_CHANNEL }}" \
-F document="@$apk" \ -F document="@$apk" \
--silent --show-error --fail >/dev/null --silent --show-error --fail >/dev/null
sleep 1
done done
} }
upload apks/NekoX-*-mini-*-release.apk upload apks/NekoX-*-mini-*-release.apk

2
TMessagesProj/build.gradle
View File

@ -4,7 +4,7 @@ apply plugin: "com.android.application"
apply plugin: "kotlin-android" apply plugin: "kotlin-android"
def verName = "8.5.1-preview01" def verName = "8.5.1-preview01"
def verCode = 560 def verCode = 565
if (System.getenv("DEBUG_BUILD") == "true") { 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()

5
TMessagesProj/jni/CMakeLists.txt
View File

@ -762,11 +762,6 @@ target_link_libraries(${NATIVE_LIB}
OpenSLES OpenSLES
cpufeatures) 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) include(AndroidNdkModules)
android_ndk_import_module_cpufeatures() android_ndk_import_module_cpufeatures()