CI: modify ci

KangLin · KangLin · commit a8fcd91a0374 · 2025-05-06T10:12:00.000+08:00
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -37,7 +37,7 @@ jobs:
       SOURCE_DIR:  ${{github.workspace}}/.cache/source
       TOOSL_DIR:   ${{github.workspace}}/.cache/tools
       INSTALL_DIR: ${{github.workspace}}/.cache/install_${{matrix.BUILD_TYPE}}
-      VCPKGGITCOMMITID: 110c50d4700794d87d95138cd8c1b3bbfee9bab5
+      VCPKGGITCOMMITID: d8ad13c401b30c2836d00b8923c9127f05f591c7
       VCPKG_TARGET_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
       VCPKG_DEFAULT_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
       VCPKG_DEFAULT_HOST_TRIPLET: x64-linux
@@ -71,7 +71,7 @@ jobs:
           echo "ANDROID_NDK:${ANDROID_NDK}"
 
       - name: Cache installed
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         id: cache-installed
         with:
           path: |
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,qt-installer.sh"
+          skip: "*.lua,codespell.yml,*.ts,qt-installer.sh,flags.patch,vcpkg/,vcpkg/*.*,vcpkg/*"
           ignore_words_list: "nD,rabits"
diff --git a/.github/workflows/doxygen.yml b/.github/workflows/doxygen.yml
@@ -42,7 +42,7 @@ jobs:
           cmake -E make_directory ${{github.workspace}}/build
 
       - name: Cache installed
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         id: cache-installed
         with:
           path: |
diff --git 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.7.1, 5.15.2, 5.12.12]
+        qt_version: [6.9.0, 5.15.2, 5.12.12]
         qt_arch: [clang_64]
         VCPKG_TARGET_TRIPLET: [x64-osx]
         include:
-          - qt_version: 6.7.1
+          - qt_version: 6.9.0
             qt_modules: qtscxml qtpositioning qt5compat qtwebchannel qtpositioning qtmultimedia
             ENABLE_DOWNLOAD_MODULE: ON
 
@@ -40,7 +40,7 @@ jobs:
       TOOSL_DIR:   ${{github.workspace}}/.cache/tools
       INSTALL_DIR: ${{github.workspace}}/.cache/install_2024_03_13
       qt_modules: qtwebengine ${{matrix.qt_modules}}
-      VCPKGGITCOMMITID: 110c50d4700794d87d95138cd8c1b3bbfee9bab5
+      VCPKGGITCOMMITID: d8ad13c401b30c2836d00b8923c9127f05f591c7
       VCPKG_TARGET_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
       artifact_name: build_macos
       FaceRecognizer_VERSION: v0.0.4
@@ -64,7 +64,7 @@ jobs:
           cmake -E make_directory ${{github.workspace}}/build
 
       - name: Cache installed
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: cache-installed
         with:
           path: |
@@ -170,7 +170,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.7.1' }}
+        if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.9.0' }}
         uses: actions/upload-artifact@v4
         with:
           name: ${{ env.artifact_name }}_${{matrix.qt_version}}_${{matrix.qt_arch}}
diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
@@ -50,7 +50,6 @@ jobs:
             mingw-w64-x86_64-nsis ^
             mingw-w64-x86_64-gcc ^
             mingw-w64-x86_64-qt5 ^
-            mingw-w64-x86_64-qtwebkit ^
             mingw-w64-x86_64-zlib ^
             mingw-w64-x86_64-openssl ^
             mingw-w64-x86_64-cyrus-sasl ^
@@ -73,7 +72,7 @@ jobs:
           cmake -E make_directory ${{github.workspace}}\build
     
       - name: Cache installed
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: cache-installed
         with:
           path: |
diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml
@@ -13,11 +13,11 @@ jobs:
     strategy:
       matrix:
         BUILD_TYPE: [Release, Debug]
-        qt_version: [6.7.1, 5.15.2, 5.12.12]
+        qt_version: [6.9.0, 5.15.2, 5.12.12]
         include:
-          - qt_version: 6.7.1
+          - qt_version: 6.9.0
             qt_arch: win64_msvc2019_64
-            qt_modules: qtscxml qtpositioning qtwebchannel qtwebsockets qtwebview qtmultimedia qt5compat
+            qt_modules: qtscxml qtpositioning qtmultimedia qt5compat
             VCPKG_TARGET_TRIPLET: x64-windows
             VCPKG_PLATFORM_TOOLSET: v143
             CMAKE_GENERATOR_PLATFORM: x64
@@ -45,7 +45,7 @@ jobs:
       INSTALL_DIR: ${{github.workspace}}\.cache\install_msvc_${{matrix.CMAKE_GENERATOR_PLATFORM}}_${{matrix.BUILD_TYPE}}
       CMAKE_GENERATOR: "Visual Studio 17 2022"
       CMAKE_GENERATOR_PLATFORM: ${{matrix.CMAKE_GENERATOR_PLATFORM}}
-      VCPKGGITCOMMITID: 110c50d4700794d87d95138cd8c1b3bbfee9bab5
+      VCPKGGITCOMMITID: d8ad13c401b30c2836d00b8923c9127f05f591c7
       VCPKG_PLATFORM_TOOLSET: ${{matrix.VCPKG_PLATFORM_TOOLSET}}
       VCPKG_TARGET_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
       qt_modules: qtwebengine ${{matrix.qt_modules}}
@@ -75,7 +75,7 @@ jobs:
           cmake -E make_directory ${{env.INSTALL_DIR}}
 
       - name: Cache installed
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: cache-installed
         with:
           path: |
@@ -136,21 +136,15 @@ jobs:
             cmake --build . --config ${{matrix.BUILD_TYPE}} --target install
           )
 
-      - name: Cache Qt
-        id: cache-qt
-        uses: actions/cache@v1  # not v2!
-        with:
-          path: ${{env.TOOSL_DIR}}/qt
-          key: qt_${{matrix.qt_version}}_${{matrix.qt_arch}}
-
       - name: Install Qt
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
-          dir: '${{env.TOOSL_DIR}}/qt' # optional
+          dir: '${{env.TOOLS_DIR}}/qt' # optional
           version: '${{matrix.qt_version}}' # optional, default is 5.15.2
           arch: '${{matrix.qt_arch}}' # optional
-          modules: '${{env.qt_modules}}' # optional. See: https://ddalcino.github.io/aqt-list-server/
-          cached: '${{steps.cache-qt.outputs.cache-hit}}' # optional, default is false
+          modules: '${{env.qt_modules}}' # optional.  see: https://ddalcino.github.io/aqt-list-server/
+          cache: true
+          cache-key-prefix: cached-qt_${{matrix.qt_version}}_${{matrix.qt_arch}}
 
       - name: git clone RabbitCommon
         working-directory: ${{env.SOURCE_DIR}}
@@ -203,7 +197,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.7.1' }}
+        if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.9.0' }}
         working-directory: ${{github.workspace}}\build
         run: |
           ${{github.workspace}}\build\install\bin\FaceRecognizerApp.exe ^
@@ -215,7 +209,7 @@ jobs:
               -m "${{env.FaceRecognizer_VERSION}}"
 
       - name: Update artifact
-        if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.7.1' }}
+        if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.9.0' }}
         uses: actions/upload-artifact@v4
         with:
           name: ${{ env.artifact_name }}_${{matrix.qt_version}}_${{matrix.qt_arch}}
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -59,7 +59,6 @@ jobs:
                 qt6-base-dev qt6-base-dev-tools qt6-qpa-plugins \
                 libqt6svg6-dev qt6-l10n-tools qt6-translations-l10n \
                 qt6-scxml-dev qt6-multimedia-dev libqt6serialport6-dev \
-                qt6-webengine-dev qt6-webengine-dev-tools \
                 libqt6core5compat6-dev \
                 libutf8proc-dev libpam0g-dev \
                 libxkbcommon-dev libxkbcommon-x11-dev xorg-dev libx11-xcb-dev \
@@ -70,7 +69,7 @@ jobs:
                 libsqlite3-dev
 
       - name: Cache installed
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: cache-installed
         with:
           path: |
@@ -124,7 +123,7 @@ jobs:
           facedetection_DIR: ${{env.INSTALL_DIR}}/lib/cmake/facedetection
           ENABLE_DOWNLOAD_MODULE: ON
         run: |
-          export Qt6_DIR=/usr/lib/`uname -a`-linux-gnu/cmake/Qt6      
+          export Qt6_DIR=/usr/lib/`uname -a`-linux-gnu/cmake/Qt6
           ./build_debpackage.sh
           cp ../facerecognizer_${{env.FaceRecognizer_VERSION}}_amd64.deb facerecognizer_${{env.FaceRecognizer_VERSION}}_amd64.deb
 
