diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-02-09 10:51:43 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-02-17 13:57:47 +0000 |
| commit | 344253220fec3351956c12fa51e08caca9948e69 (patch) | |
| tree | fe61181a5a8d4d112ac849d460e2d45ea5ccefe6 | |
| parent | 9fd8a4a687834d98306da6a878fd4132159cb950 (diff) | |
Prune Linux configurations in CI
Remove the various FEATURE_xxx=off configurations, we don't support them
and if we break stuff, then those issues are easily fixed after the fact
and users relying on those combinations can provide patches. Most of them
are obsolete with Qt 6 anyway, as users can just not link against QtGui
or QtWidgets.
Also remove the -no-opengl configuration, with RHI it's mostly irrelevant
as there is very little Qt code outside of RHI that calls OpenGL APIs.
Combine the various other configurations into a single configuration
and remove subtle variations.
Change-Id: Ia35713fc7373d54b82a11be14e2272ff011a51ab
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit 2e4d6af57437785c450d8030feacae5565e30cc6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | coin/platform_configs/cmake_platforms.yaml | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 74849103..7e69cfbd 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -12,21 +12,6 @@ Configurations: - Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'GCC' - Features: ['Sccache'] - Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_widgets=OFF' -- - Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' - Compiler: 'GCC' - Features: ['Sccache', 'DisableTests'] - Configure arguments: '-DFEATURE_developer_build=ON -DFEATURE_gui=OFF' -- - Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' - Compiler: 'GCC' - Features: ['Sccache', 'DisableTests'] - Configure arguments: '-DFEATURE_developer_build=ON -DINPUT_opengl=no' -- - Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' - Compiler: 'GCC' Features: ['Sccache', 'Documentation', 'TestDocs'] Configure arguments: '-DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DWARNINGS_ARE_ERRORS=OFF -DQT_LIBINFIX=TestInfix -DQT_NAMESPACE=TestNamespace' - @@ -34,7 +19,7 @@ Configurations: Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'GCC' Features: ['Sccache'] - Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DCMAKE_AUTOGEN_VERBOSE=ON' + Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_headersclean=ON -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DCMAKE_AUTOGEN_VERBOSE=ON -DINPUT_bundled_xcb_xinput=yes -DOpenGL_GL_PREFERENCE=LEGACY' - Id: 'OpenSUSE-15.3-host' Template: 'qtci-linux-openSUSE-15.3-x86_64-50' @@ -44,11 +29,6 @@ Configurations: Environment variables: [ 'CONAN_PROFILE=coin/conan/profiles/linux-developer-x86_64-gcc'] - - Template: 'qtci-linux-openSUSE-15.3-x86_64-50' - Compiler: 'GCC' - Features: ['Sccache'] - Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_headersclean=ON -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DINPUT_bundled_xcb_xinput=yes -DOpenGL_GL_PREFERENCE=LEGACY' -- Template: 'qtci-linux-SLES-15_SP3-x86_64-51' Compiler: 'GCC' Features: ['Sccache', 'DisableTests'] |