From 2b157f5ec0e96274a312ef52853e0d52f14f7ca9 Mon Sep 17 00:00:00 2001 From: Qsaker Date: Fri, 2 Feb 2024 11:39:30 +0800 Subject: [PATCH] chore: update script --- .github/workflows/build-android.yml | 5 +++-- .github/workflows/build-daily.yml | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml index 4a599615..5cf134c2 100644 --- a/.github/workflows/build-android.yml +++ b/.github/workflows/build-android.yml @@ -47,7 +47,8 @@ jobs: -DCMAKE_BUILD_TYPE:STRING=Release ^ -DCMAKE_CXX_COMPILER:FILEPATH="%ANDROID_NDK_ROOT%/toolchains/llvm/prebuilt/windows-x86_64/bin/clang++.exe" ^ -DANDROID_SDK_ROOT:PATH="%ANDROID_SDK_ROOT%" ^ - -DANDROID_NDK_ROOT:PATH="%ANDROID_NDK_ROOT%" + -DANDROID_NDK_ROOT:PATH="%ANDROID_NDK_ROOT%" ^ + -DBUILD_SHARED_LIBS:BOOL=OFF - name: Directory of build\armeabi_v7a shell: cmd run: dir build\armeabi_v7a @@ -56,7 +57,7 @@ jobs: run: | set JAVA_HOME=%JAVA_HOME_11_X64% echo %JAVA_HOME% - cmake -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_BUILD_TYPE:STRING=Release --build build\armeabi_v7a --target QtSwissArmyKnife + cmake --build build\armeabi_v7a --target QtSwissArmyKnife --config Release - name: Directory of build\armeabi_v7a shell: cmd run: dir build\armeabi_v7a diff --git a/.github/workflows/build-daily.yml b/.github/workflows/build-daily.yml index 10aacd53..af6831ff 100644 --- a/.github/workflows/build-daily.yml +++ b/.github/workflows/build-daily.yml @@ -159,13 +159,14 @@ jobs: -DCMAKE_BUILD_TYPE:STRING=Release ^ -DCMAKE_CXX_COMPILER:FILEPATH="%ANDROID_NDK_ROOT%/toolchains/llvm/prebuilt/windows-x86_64/bin/clang++.exe" ^ -DANDROID_SDK_ROOT:PATH="%ANDROID_SDK_ROOT%" ^ - -DANDROID_NDK_ROOT:PATH="%ANDROID_NDK_ROOT%" + -DANDROID_NDK_ROOT:PATH="%ANDROID_NDK_ROOT%" ^ + -DBUILD_SHARED_LIBS:BOOL=OFF - name: Build for Android shell: cmd run: | set JAVA_HOME=%JAVA_HOME_11_X64% echo %JAVA_HOME% - cmake --build -DBUILD_SHARED_LIBS:BOOL=OFF build\armeabi_v7a --target QtSwissArmyKnife --config Release + cmake --build build\armeabi_v7a --target QtSwissArmyKnife --config Release ${{ github.workspace }}\Qt\${{env.QT_VERSION}}\mingw_64\bin\androiddeployqt.exe ^ --input build\armeabi_v7a\android-QtSwissArmyKnife-deployment-settings.json ^ --output build\armeabi_v7a\android-build ^