Skip to content

Commit

Permalink
CI: update qt version to 6.7.1
Browse files Browse the repository at this point in the history
  • Loading branch information
KangLin committed May 30, 2024
1 parent 3b06be6 commit 0d67038
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
matrix:
BUILD_TYPE: [Release]
qt_arch: [android_arm64_v8a, android_x86_64]
qt_version: [6.6.2]
qt_version: [6.7.1]
include:
- qt_arch: android_arm64_v8a
VCPKG_TARGET_TRIPLET: arm64-android
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ jobs:
matrix:
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
BUILD_TYPE: [Release, Debug]
qt_version: [6.6.2, 5.15.2, 5.12.12]
qt_version: [6.7.1, 5.15.2, 5.12.12]
qt_arch: [clang_64]
VCPKG_TARGET_TRIPLET: [x64-osx]
include:
- qt_version: 6.6.2
- qt_version: 6.7.1
qt_modules: qtscxml qtpositioning qt5compat qtwebchannel qtwebsockets qtmultimedia
ENABLE_DOWNLOAD_MODULE: ON

Expand Down Expand Up @@ -177,7 +177,7 @@ jobs:
7z a FaceRecognizer_${{env.FaceRecognizer_VERSION}}_macos_qt${{matrix.qt_version}}.zip ./install/*
- name: Update artifact
if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.6.2' }}
if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.7.1' }}
uses: actions/upload-artifact@v3
with:
name: ${{ env.artifact_name }}
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/msvc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ jobs:
strategy:
matrix:
BUILD_TYPE: [Release, Debug]
qt_version: [6.6.2, 5.15.2, 5.12.12]
qt_version: [6.7.1, 5.15.2, 5.12.12]
include:
- qt_version: 6.6.2
- qt_version: 6.7.1
qt_arch: win64_msvc2019_64
qt_modules: qtscxml qtpositioning qtwebchannel qtwebsockets qtwebview qtmultimedia qt5compat
VCPKG_TARGET_TRIPLET: x64-windows
Expand Down Expand Up @@ -172,10 +172,10 @@ jobs:
-DCMAKE_INSTALL_PREFIX=${{github.workspace}}/build/install ^
-DCMAKE_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake ^
-DVCPKG_VERBOSE=ON ^
-DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON ^
-DVCPKG_APPLOCAL_DEPS=ON ^
-DVCPKG_TRACE_FIND_PACKAGE=ON ^
-DVCPKG_TARGET_TRIPLET=${{matrix.VCPKG_TARGET_TRIPLET}} ^
-DX_VCPKG_APPLOCAL_DEPS_INSTALL=OFF ^
-DVCPKG_APPLOCAL_DEPS=OFF ^
-DVCPKG_TRACE_FIND_PACKAGE=ON ^
-DRABBIT_ENABLE_INSTALL_DEPENDENT=ON ^
-DRABBIT_ENABLE_INSTALL_QT=ON ^
-DRABBIT_ENABLE_INSTALL_TO_BUILD_PATH=OFF ^
Expand Down Expand Up @@ -203,7 +203,7 @@ jobs:
copy /Y FaceRecognizer_${{env.FaceRecognizer_VERSION}}_Setup.exe FaceRecognizer_${{env.FaceRecognizer_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}_Setup.exe
- name: Update configure file
if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.6.2' }}
if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.7.1' }}
working-directory: ${{github.workspace}}\build
run: |
${{github.workspace}}\build\install\bin\FaceRecognizerApp.exe ^
Expand All @@ -215,7 +215,7 @@ jobs:
-m "${{env.FaceRecognizer_VERSION}}"
- name: Update artifact
if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.6.2' }}
if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.7.1' }}
uses: actions/upload-artifact@v3
with:
name: ${{ env.artifact_name }}
Expand Down

0 comments on commit 0d67038

Please sign in to comment.