Skip to content

Commit 463582c

Browse files
committed
ci: Don't build Qt5/QtQuick in CI to improve turnaround times
We've already stated in README that KDDW-QtQuick requires Qt 6. It still works and we'll add important fixes for legacy users. But it needs to phase out as it's very difficult to maintain two sets of .qml files, since we can't ifdef to support 2 Qt versions.
1 parent 73521c3 commit 463582c

2 files changed

Lines changed: 8 additions & 50 deletions

File tree

.github/workflows/build-qt5.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,17 +61,11 @@ jobs:
6161
- name: Build Project ${{ matrix.preset.build_preset_arg }}
6262
run: cmake --build ./build-${{ matrix.preset.name }} ${{ matrix.preset.build_preset_arg }}
6363

64-
- name: Run tests on Linux
65-
if: ${{ startsWith(matrix.preset.name, 'ci-dev-') && runner.os == 'Linux' }}
64+
- name: Run tests
6665
run: ctest --test-dir ./build-${{ matrix.preset.name }} --verbose -j 4
6766
env:
68-
QT_QUICK_BACKEND: software
6967
LSAN_OPTIONS: detect_leaks=${{ matrix.preset.detect_leaks }}
7068

71-
- name: Run tests on Window/macOS
72-
if: ${{ startsWith(matrix.preset.name, 'ci-dev-') && runner.os != 'Linux' }}
73-
run: ctest --test-dir ./build-${{ matrix.preset.name }} --verbose -j 4
74-
7569
- name: Read tests log when it fails
7670
uses: andstor/file-reader-action@v1
7771
if: ${{ failure() && startsWith(matrix.preset.name, 'ci-dev-') }}

CMakePresets.json

Lines changed: 7 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@
5252
"displayName": "dev",
5353
"binaryDir": "${sourceDir}/build-dev",
5454
"cacheVariables": {
55-
"KDDockWidgets_QT6": "OFF"
55+
"KDDockWidgets_QT6": "OFF",
56+
"KDDockWidgets_FRONTENDS": "qtwidgets"
5657
},
5758
"inherits": [
5859
"dev-base"
@@ -64,7 +65,8 @@
6465
"description": "An ASAN/UBSAN build",
6566
"binaryDir": "${sourceDir}/build-dev-asan",
6667
"cacheVariables": {
67-
"KDDockWidgets_QT6": "OFF"
68+
"KDDockWidgets_QT6": "OFF",
69+
"KDDockWidgets_FRONTENDS": "qtwidgets"
6870
},
6971
"inherits": [
7072
"dev-base",
@@ -161,7 +163,7 @@
161163
"CMAKE_BUILD_TYPE": "Release",
162164
"KDDockWidgets_QT6": "OFF",
163165
"CMAKE_UNITY_BUILD": "OFF",
164-
"KDDockWidgets_FRONTENDS": "qtwidgets;qtquick"
166+
"KDDockWidgets_FRONTENDS": "qtwidgets"
165167
}
166168
},
167169
{
@@ -174,7 +176,7 @@
174176
"KDDockWidgets_QT6": "OFF",
175177
"CMAKE_UNITY_BUILD": "OFF",
176178
"KDDockWidgets_X11EXTRAS": "OFF",
177-
"KDDockWidgets_FRONTENDS": "qtwidgets;qtquick"
179+
"KDDockWidgets_FRONTENDS": "qtwidgets"
178180
}
179181
},
180182
{
@@ -188,18 +190,6 @@
188190
"KDDockWidgets_FRONTENDS": "qtwidgets;qtquick"
189191
}
190192
},
191-
{
192-
"name": "python",
193-
"displayName": "Qt5 python bindings",
194-
"generator": "Ninja",
195-
"binaryDir": "${sourceDir}/build-python",
196-
"inherits": [
197-
"python-base"
198-
],
199-
"cacheVariables": {
200-
"KDDockWidgets_QT6": "OFF"
201-
}
202-
},
203193
{
204194
"name": "python6",
205195
"displayName": "Qt6 python bindings",
@@ -441,7 +431,7 @@
441431
"KDDockWidgets_DEVELOPER_MODE": "ON",
442432
"KDDockWidgets_QT6": "OFF",
443433
"CMAKE_BUILD_TYPE": "Debug",
444-
"KDDockWidgets_FRONTENDS": "qtwidgets;qtquick"
434+
"KDDockWidgets_FRONTENDS": "qtwidgets"
445435
}
446436
},
447437
{
@@ -450,39 +440,13 @@
450440
"description": "Qt5 non dev-mode build",
451441
"binaryDir": "${sourceDir}/build-ci-release-qt5",
452442
"generator": "Ninja",
453-
"cacheVariables": {
454-
"KDDockWidgets_DEVELOPER_MODE": "OFF",
455-
"KDDockWidgets_QT6": "OFF",
456-
"CMAKE_BUILD_TYPE": "RelWithDebInfo",
457-
"KDDockWidgets_FRONTENDS": "qtwidgets;qtquick"
458-
}
459-
},
460-
{
461-
"name": "ci-qtwidgets-qt5",
462-
"displayName": "ci-qtwidgets-qt5",
463-
"description": "Qt5 build which excludes QtQuick",
464-
"binaryDir": "${sourceDir}/build-ci-qtwidgets-qt5",
465-
"generator": "Ninja",
466443
"cacheVariables": {
467444
"KDDockWidgets_DEVELOPER_MODE": "OFF",
468445
"KDDockWidgets_QT6": "OFF",
469446
"CMAKE_BUILD_TYPE": "RelWithDebInfo",
470447
"KDDockWidgets_FRONTENDS": "qtwidgets"
471448
}
472449
},
473-
{
474-
"name": "ci-qtquick-qt5",
475-
"displayName": "ci-qtquick-qt5",
476-
"description": "Qt5 build which excludes QtWidgets",
477-
"binaryDir": "${sourceDir}/build-ci-qtquick-qt5",
478-
"generator": "Ninja",
479-
"cacheVariables": {
480-
"KDDockWidgets_DEVELOPER_MODE": "OFF",
481-
"KDDockWidgets_QT6": "OFF",
482-
"CMAKE_BUILD_TYPE": "RelWithDebInfo",
483-
"KDDockWidgets_FRONTENDS": "qtquick"
484-
}
485-
},
486450
{
487451
"name": "ci-dev-qt6",
488452
"displayName": "ci-dev-qt6",

0 commit comments

Comments
 (0)