Modify CI

KangLin · Jun 30, 2023 · a5deddc · a5deddc
1 parent 1afabf1
commit a5deddc
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -117,7 +117,7 @@ jobs:
           appendedCacheKey: android_${{matrix.os}}-qt${{matrix.qt_version}}-${{matrix.VCPKG_TARGET_TRIPLET}}-${{matrix.BUILD_TYPE}}-${{env.VCPKGGITCOMMITID}}
           additionalCachedPaths: $VCPKG_ROOT/installed
           vcpkgTriplet: '${{ matrix.VCPKG_TARGET_TRIPLET }}'
-          vcpkgArguments: 'openssl '
+          vcpkgArguments: 'openssl libpng pixman libjpeg-turbo libyuv ffmpeg opencv'
 
       - name: git clone RabbitCommon
         working-directory: ${{env.SOURCE_DIR}}

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -20,6 +20,9 @@ jobs:
 
   macos:
     uses: ./.github/workflows/macos.yml
+
+  android:
+    uses: ./.github/workflows/android.yml
 
   deploy:
     if: ${{ startsWith(github.ref, 'refs/tags/') }}

diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml
@@ -18,5 +18,5 @@ jobs:
         with:
           check_filenames: true
           path: ${{github.workspace}}
-          skip: "*.lua,codespell.yml,*.ts"
-          ignore_words_list: "\033[nD,rabits"
+          skip: "*.lua,codespell.yml,*.ts,qt-installer.sh"
+          ignore_words_list: "nD,rabits"
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -138,22 +138,22 @@ jobs:
         working-directory: ${{github.workspace}}/build
         env:
           RabbitCommon_DIR: ${{env.SOURCE_DIR}}/RabbitCommon
-          SeetaFace_DIR: ${{env.INSTALL_DIR}}/lib/cmake
-          SeetaNet_DIR: ${{env.INSTALL_DIR}}/lib/cmake
-          SeetaFaceDetector_DIR: ${{env.INSTALL_DIR}}/lib/cmake
-          SeetaFaceLandmarker_DIR: ${{env.INSTALL_DIR}}/lib/cmake
-          SeetaFaceRecognizer_DIR: ${{env.INSTALL_DIR}}/lib/cmake
-          SeetaFaceTracker_DIR: ${{env.INSTALL_DIR}}/lib/cmake
-          SeetaQualityAssessor_DIR: ${{env.INSTALL_DIR}}/lib/cmake
-          facedetection_DIR: ${{env.INSTALL_DIR}}/lib/cmake/facedetection
         run: |
           cmake ${{github.workspace}} \
               -DCMARK_SHARED=OFF \
               -DCMARK_TESTS=OFF \
               -DCMARK_STATIC=ON \
               -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} \
               -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/build/install \
-              -DCMAKE_TOOLCHAIN_FILE="${{env.VCPKG_ROOT}}\scripts\buildsystems\vcpkg.cmake"
+              -DCMAKE_TOOLCHAIN_FILE="${{env.VCPKG_ROOT}}\scripts\buildsystems\vcpkg.cmake" \
+              -DSeetaFace_DIR=${{env.INSTALL_DIR}}/lib/cmake \
+              -DSeetaNet_DIR=${{env.INSTALL_DIR}}/lib/cmake \
+              -DSeetaFaceDetector_DIR=${{env.INSTALL_DIR}}/lib/cmake \
+              -DSeetaFaceLandmarker_DIR=${{env.INSTALL_DIR}}/lib/cmake \
+              -DSeetaFaceRecognizer_DIR=${{env.INSTALL_DIR}}/lib/cmake \
+              -DSeetaFaceTracker_DIR=${{env.INSTALL_DIR}}/lib/cmake \
+              -DSeetaQualityAssessor_DIR=${{env.INSTALL_DIR}}/lib/cmake \
+              -Dfacedetection_DIR=${{env.INSTALL_DIR}}/lib/cmake/facedetection
           cmake --build . --config ${{ matrix.BUILD_TYPE }} --target install
           7z a FaceRecognizer_${{env.FaceRecognizer_VERSION}}_macos_qt${{matrix.qt_version}}.zip ./install/*