CI: modify android.yml

KangLin · Mar 14, 2024 · f854f4a · f854f4a
1 parent 80e5e6b
commit f854f4a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -13,23 +13,18 @@ jobs:
     strategy:
       matrix:
         BUILD_TYPE: [Release]
-        qt_arch: [android_arm64_v8a, android_armv7, android_x86_64]
+        qt_arch: [android_arm64_v8a, android_x86_64]
         qt_version: [6.6.2]
         include:
           - qt_arch: android_arm64_v8a
             VCPKG_TARGET_TRIPLET: arm64-android
             ANDROID_ABI: arm64-v8a
-            ENABLE_DOWNLOAD: ON
-
-          - qt_arch: android_armv7
-            VCPKG_TARGET_TRIPLET: arm-android
-            ANDROID_ABI: armeabi-v7a
-            ENABLE_DOWNLOAD_MODULE: OFF
+            ENABLE_DOWNLOAD_MODULE: ON
 
           - qt_arch: android_x86_64
             VCPKG_TARGET_TRIPLET: x64-android
             ANDROID_ABI: x86_64
-            ENABLE_DOWNLOAD: ON
+            ENABLE_DOWNLOAD_MODULE: ON
 
     runs-on: ubuntu-latest
 
@@ -134,10 +129,10 @@ jobs:
                 -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} \
                 -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} \
                 -DCMAKE_VERBOSE_MAKEFILE=ON \
-                -DQT_HOST_PATH=${Qt6_DIR}/../gcc_64 \
                 -DQT_CHAINLOAD_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake \
                 -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \
                 -DVCPKG_TARGET_TRIPLET=${{env.VCPKG_TARGET_TRIPLET}} \
+                -DANDROID_ABI=${{env.ANDROID_ABI}} \
                 -DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON \
                 -DVCPKG_TRACE_FIND_PACKAGE=ON \
                 -DVCPKG_INSTALLED_DIR=${{env.INSTALL_DIR}}/SeetaFace2/vcpkg_installed \
@@ -158,13 +153,13 @@ jobs:
                 -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} \
                 -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} \
                 -DCMAKE_VERBOSE_MAKEFILE=ON \
-                -DQT_HOST_PATH=${Qt6_DIR}/../gcc_64 \
                 -DQT_CHAINLOAD_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake \
                 -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \
                 -DVCPKG_TARGET_TRIPLET=${{env.VCPKG_TARGET_TRIPLET}} \
                 -DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON \
                 -DVCPKG_TRACE_FIND_PACKAGE=ON \
-                -DVCPKG_INSTALLED_DIR=${{env.INSTALL_DIR}}/libfacedetection/vcpkg_installed                
+                -DVCPKG_INSTALLED_DIR=${{env.INSTALL_DIR}}/libfacedetection/vcpkg_installed \
+                -DANDROID_ABI=${{env.ANDROID_ABI}}
             cmake --build . --verbose --config ${{matrix.BUILD_TYPE}}
             cmake --build . --verbose --config ${{matrix.BUILD_TYPE}} --target install
           fi
@@ -194,6 +189,7 @@ jobs:
               -DVCPKG_TARGET_TRIPLET=${{env.VCPKG_TARGET_TRIPLET}} \
               -DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON \
               -DVCPKG_APPLOCAL_DEPS=ON \
+              -DANDROID_ABI=${{env.ANDROID_ABI}} \
               -DINSTALL_QT=ON \
               -DQT_HOST_PATH=${Qt6_DIR}/../gcc_64 \
               -DQT_ANDROID_SIGN_APK=ON \

diff --git a/vcpkg.json b/vcpkg.json
@@ -1,7 +1,9 @@
 {
   "name": "facerecognizer",
   "version-string":"0.0.4",
-
+  "license": "GPL-3",
+  "homepage": "https://github.com/KangLin/facerecognizer",
+
   "dependencies": [
     "openssl"
   ],