提交 c671c700 编写于 作者: kl222's avatar kl222

CI: modify ubuntu

上级 00fca012
......@@ -12,10 +12,10 @@ jobs:
ANDROID_ABI: [armeabi-v7a, x86]
ANDROID_PLATFORM: [android-28]
os: [Ubuntu-20.04]
qt_version: [6.2.4]
qt_version: [lOpenCV]
include:
- VCPKG_TARGET_TRIPLET: arm-android
qt_version: 6.2.4
qt_version: lOpenCV
qt_arch: android_armv7
ANDROID_ABI: armeabi-v7a
qt_modules: 'qtscxml qtmultimedia qtwebview qtimageformats'
......
......@@ -15,12 +15,12 @@ jobs:
BUILD_TYPE: [Release, Debug]
qt_version: [5.15.2, 5.12.12]
include:
# - qt_version: 6.4.2
# - qt_version: 6.5.1
# triplet: x64-windows
# VCPKG_PLATFORM_TOOLSET: v142
# qt_arch: win64_msvc2019_64
# CMAKE_GENERATOR_PLATFORM: x64
# qt_modules: qtscxml qtpositioning
# qt_modules: qtscxml qtpositioning qtwebchannel qtwebsockets qtwebview
- qt_version: 5.15.2
qt_arch: win64_msvc2019_64
......@@ -86,7 +86,7 @@ jobs:
# compute its hash and append this to the computed cache's key.
appendedCacheKey: cache-vcpkg-msvc-${{matrix.os}}-vc${{matrix.VCPKG_PLATFORM_TOOLSET}}-${{matrix.triplet}}-qt${{matrix.qt_version}}-${{matrix.BUILD_TYPE}}-${{env.VCPKGGITCOMMITID}}
vcpkgTriplet: '${{matrix.triplet}}'
vcpkgArguments: 'openssl libpng pixman libjpeg-turbo libyuv ffmpeg opencv dlib ncnn'
vcpkgArguments: 'openssl libpng pixman libjpeg-turbo libyuv ffmpeg opencv dlib' # ncnn'
- name: build SeetaFace2
working-directory: ${{env.SOURCE_DIR}}
......
......@@ -67,4 +67,4 @@ override_dh_auto_build:
# cmake --build . --config Release --target install/strip
override_dh_shlibdeps:
dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info -l`pwd`/debian/facerecognizer/opt/FaceRecognizer/lib:$(LIB_PARAS)
dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info -l`pwd`/debian/facerecognizer/opt/FaceRecognizer/lib:`pwd`/debian/facerecognizer/opt/FaceRecognizer/lib/`uname -m`-linux-gnu:$(LIB_PARAS)
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册