Skip to content

Commit

Permalink
Modify CI
Browse files Browse the repository at this point in the history
  • Loading branch information
KangLin committed Jun 30, 2023
1 parent 1afabf1 commit 4a42493
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 13 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ jobs:
cached: '${{ steps.cache-qt.outputs.cache-hit }}' # optional, default is false

- name: run-vcpkg
if: false
uses: lukka/[email protected]
with:
# Indicates whether to only setup vcpkg (i.e. installing it and setting the environment variables VCPKG_ROOT, RUNVCPK_VCPKG_ROOT), without installing any port.
Expand All @@ -117,7 +116,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}}
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ jobs:

macos:
uses: ./.github/workflows/macos.yml

android:
uses: ./.github/workflows/android.yml

deploy:
if: ${{ startsWith(github.ref, 'refs/tags/') }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codespell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
18 changes: 9 additions & 9 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/*
Expand Down
1 change: 1 addition & 0 deletions App/FrmRecognizerImage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include <QStandardItem>
#include <QPen>
#include <stdexcept>
#include <QDebug>

CFrmRecognizerImage::CFrmRecognizerImage(QWidget *parent) :
QWidget(parent),
Expand Down
1 change: 1 addition & 0 deletions App/FrmRegisterVideo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include <QPainter>
#include <FactoryFace.h>
#include <stdexcept>
#include <QDebug>

CFrmRegisterVideo::CFrmRegisterVideo(QWidget *parent) :
QWidget(parent),
Expand Down
1 change: 1 addition & 0 deletions App/ManageRegisterVideo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include "ManageRegisterVideo.h"
#include <stdexcept>
#include <QDebug>

CManageRegisterVideo::CManageRegisterVideo(QWidget *parent) : QWidget(parent)
{
Expand Down

0 comments on commit 4a42493

Please sign in to comment.