From 0d6703845dde793b154588c4ea7fb1e51811e9a7 Mon Sep 17 00:00:00 2001
From: Kang Lin <kl222@126.com>
Date: Thu, 30 May 2024 16:41:56 +0800
Subject: [PATCH] CI: update qt version to 6.7.1

---
 .github/workflows/android.yml |  2 +-
 .github/workflows/macos.yml   |  6 +++---
 .github/workflows/msvc.yml    | 14 +++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index a93f9c7..890a9e1 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -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
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 8d4fddd..aae4664 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -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
 
@@ -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 }}
diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml
index 618d73e..596cb7d 100644
--- a/.github/workflows/msvc.yml
+++ b/.github/workflows/msvc.yml
@@ -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
@@ -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 ^
@@ -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 ^
@@ -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 }}