Skip to content

Commit 76900bb

Browse files
committed
CI: update qt version
1 parent 9c96f10 commit 76900bb

4 files changed

Lines changed: 9 additions & 11 deletions

File tree

.github/workflows/macos.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ jobs:
1616
matrix:
1717
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
1818
BUILD_TYPE: [Release, Debug]
19-
qt_version: [6.7.1, 5.15.2, 5.12.12]
19+
qt_version: [6.9.0, 5.15.2, 5.12.12]
2020
qt_arch: [clang_64]
2121
VCPKG_TARGET_TRIPLET: [x64-osx]
2222
include:
23-
- qt_version: 6.7.1
23+
- qt_version: 6.9.0
2424
qt_modules: qtscxml qtpositioning qt5compat qtwebchannel qtpositioning qtmultimedia
2525
ENABLE_DOWNLOAD_MODULE: ON
2626

@@ -170,7 +170,7 @@ jobs:
170170
7z a FaceRecognizer_${{env.FaceRecognizer_VERSION}}_macos_qt${{matrix.qt_version}}.zip ./install/*
171171
172172
- name: Update artifact
173-
if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.7.1' }}
173+
if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.9.0' }}
174174
uses: actions/upload-artifact@v4
175175
with:
176176
name: ${{ env.artifact_name }}_${{matrix.qt_version}}_${{matrix.qt_arch}}

.github/workflows/mingw.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ jobs:
5050
mingw-w64-x86_64-nsis ^
5151
mingw-w64-x86_64-gcc ^
5252
mingw-w64-x86_64-qt5 ^
53-
mingw-w64-x86_64-qtwebkit ^
5453
mingw-w64-x86_64-zlib ^
5554
mingw-w64-x86_64-openssl ^
5655
mingw-w64-x86_64-cyrus-sasl ^

.github/workflows/msvc.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313
strategy:
1414
matrix:
1515
BUILD_TYPE: [Release, Debug]
16-
qt_version: [6.7.1, 5.15.2, 5.12.12]
16+
qt_version: [6.9.0, 5.15.2, 5.12.12]
1717
include:
18-
- qt_version: 6.7.1
18+
- qt_version: 6.9.0
1919
qt_arch: win64_msvc2019_64
20-
qt_modules: qtscxml qtpositioning qtwebchannel qtwebsockets qtwebview qtmultimedia qt5compat
20+
qt_modules: qtscxml qtpositioning qtmultimedia qt5compat
2121
VCPKG_TARGET_TRIPLET: x64-windows
2222
VCPKG_PLATFORM_TOOLSET: v143
2323
CMAKE_GENERATOR_PLATFORM: x64
@@ -203,7 +203,7 @@ jobs:
203203
copy /Y FaceRecognizer_${{env.FaceRecognizer_VERSION}}_Setup.exe FaceRecognizer_${{env.FaceRecognizer_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}_Setup.exe
204204
205205
- name: Update configure file
206-
if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.7.1' }}
206+
if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.9.0' }}
207207
working-directory: ${{github.workspace}}\build
208208
run: |
209209
${{github.workspace}}\build\install\bin\FaceRecognizerApp.exe ^
@@ -215,7 +215,7 @@ jobs:
215215
-m "${{env.FaceRecognizer_VERSION}}"
216216
217217
- name: Update artifact
218-
if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.7.1' }}
218+
if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.9.0' }}
219219
uses: actions/upload-artifact@v4
220220
with:
221221
name: ${{ env.artifact_name }}_${{matrix.qt_version}}_${{matrix.qt_arch}}

.github/workflows/ubuntu.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,14 @@ jobs:
5959
qt6-base-dev qt6-base-dev-tools qt6-qpa-plugins \
6060
libqt6svg6-dev qt6-l10n-tools qt6-translations-l10n \
6161
qt6-scxml-dev qt6-multimedia-dev libqt6serialport6-dev \
62-
qt6-webengine-dev qt6-webengine-dev-tools \
6362
libqt6core5compat6-dev \
6463
libutf8proc-dev libpam0g-dev \
6564
libxkbcommon-dev libxkbcommon-x11-dev xorg-dev libx11-xcb-dev \
6665
libx11-dev libxfixes-dev \
6766
libdlib-dev libopencv-dev libopencv-contrib-dev \
6867
libavcodec-dev libavformat-dev libavfilter-dev libavdevice-dev \
6968
libswresample-dev libavutil-dev \
70-
libsqlite3-dev
69+
libsqlite3-dev libcmark-dev
7170
7271
- name: Cache installed
7372
uses: actions/cache@v4

0 commit comments

Comments
 (0)