From b619ed1ba60e560d0ca7bea04d90a1ac27d69709 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 19 Aug 2020 18:17:46 +0200 Subject: [PATCH] CMake: Remove CI qmake configs for Qt 6.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Qt 6.0 is now built with CMake successfully in the CI and we have most of the coverage we had with qmake CI configurations. Apart from platforms and modules we deemed not part of 6.0 release. We didn't have enough time to disable qmake configurations for 6.0.0, but we should be able do it now for 6.1. We can also consider removing qmake configurations for 6.0.x sometime later. Remove all CI configurations that use qmake to build Qt. Keep the default.yaml license check UseLegacyInstructions configuration, because license checking hasn't been ported to use new Coin instructions. One consequence of this is that developers that are working on platforms and modules not yet ported to CMake (like WebAssembly or qtwebengine), will no longer have coverage in CI until they are ported to CMake. If there are repo owners that wish to retain CI coverage for building their repo with qmake (until a CMake port is done), they can do so by creating a product_dependencies.yaml file in the root of their repo and specifying an older qt5.git sha1 (so before this change is merged) which still contains qmake CI configurations. Task-number: QTBUG-88741 Task-number: QTBUG-86053 Change-Id: I985cf0597d6d3e1717fdff8b654397a5f9236a6e Reviewed-by: Volker Hilsheimer Reviewed-by: Joerg Bornemann Reviewed-by: Simo Fält Reviewed-by: Lars Knoll --- coin/platform_configs/default.yaml | 100 ----------------------- coin/platform_configs/qtbase.yaml | 11 --- coin/platform_configs/qtdeclarative.yaml | 5 -- coin/platform_configs/qtsdk.yaml | 15 ---- coin/platform_configs/tqtc-qt-rta.yaml | 11 --- 5 files changed, 142 deletions(-) delete mode 100644 coin/platform_configs/qtsdk.yaml delete mode 100644 coin/platform_configs/tqtc-qt-rta.yaml diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 1b9b874c..5b287447 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -1,105 +1,5 @@ Version: 2 Configurations: -- - Template: 'qtci-windows-10-x86_64-52' - Compiler: 'MSVC2019' - Features: ['UseLegacyInstructions'] - Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -headersclean -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib' -- - Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' - Compiler: 'GCC' - Features: ['UseLegacyInstructions'] - Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -R . -openssl' -- - Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' - Compiler: 'GCC' - Features: ['UseLegacyInstructions', 'DisableTests'] - Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -no-gui -R . -openssl' -- - Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' - Compiler: 'GCC' - Features: ['OutOfSourceBuild', 'Documentation', 'UseLegacyInstructions'] - Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-warnings-are-errors -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl' -- - Template: 'qtci-linux-openSUSE-15.2-x86_64-50' - Target os: 'WebAssembly' - Compiler: 'GCC' - Features: ['DisableTests', 'UseLegacyInstructions'] - Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -static -nomake tests -nomake examples -no-sql-mysql -no-pch -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-feature-thread -xplatform wasm-emscripten' -- - Template: 'qtci-linux-SLES-15_SP2-x86_64-50' - Compiler: 'GCC' - Features: ['DisableTests', 'UseLegacyInstructions'] - Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-sql-mysql -no-pch -R . -openssl' -- - Template: 'qtci-linux-CentOS-8.1-x86_64-50' - Compiler: 'GCC' - Features: ['UseLegacyInstructions'] - Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -headersclean -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -xcb -bundled-xcb-xinput -sysconfdir /etc/xdg -openssl -qt-pcre -qt-harfbuzz -R . QMAKE_LFLAGS_APP+=-s' -- - Template: 'qtci-macos-10.14-x86_64' - Compiler: 'Clang' - Features: ['UseLegacyInstructions'] - Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -headersclean -separate-debug-info -nomake tests -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' -- - Template: 'qtci-macos-10.14-x86_64' - Compiler: 'Clang' - Features: ['DisableTests', 'UseLegacyInstructions'] - Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -no-pch -no-framework -qtnamespace TestNamespace -nomake tests -nomake examples -I/usr/local/opt/openssl/include' -- - Template: 'qtci-macos-10.14-x86_64' - Target os: 'IOS_ANY' - Target arch: 'multi' - Compiler: 'Clang' - Features: ['DisableTests', 'UseLegacyInstructions'] - Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -no-icu -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -static -xplatform macx-ios-clang' -- - Template: 'qtci-macos-10.14-x86_64' - Target os: 'Android_ANY' - Target arch: 'multi' - Compiler: 'Clang' - Target compiler: 'Clang' - Features: ['DisableTests', 'UseLegacyInstructions'] - Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r21d -android-ndk-host darwin-x86_64' -- - Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' - Target os: 'QEMU' - Target arch: 'armv7' - Compiler: 'GCC' - Features: ['UseLegacyInstructions', 'InsignificantTests'] - Environment variables: ['GST_PLUGIN_SCANNER=/opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/libexec/gstreamer-1.0/gst-plugin-scanner', 'QT_QUICK_BACKEND=software'] - Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib -no-feature-forkfd_pidfd -no-warnings-are-errors' -- - Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' - Target os: 'QEMU' - Target arch: 'arm64' - Compiler: 'GCC' - Features: ['UseLegacyInstructions', 'InsignificantTests'] - Environment variables: ['GST_PLUGIN_SCANNER=/opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/libexec/gstreamer-1.0/gst-plugin-scanner', 'QT_QUICK_BACKEND=software'] - Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-feature-forkfd_pidfd -no-warnings-are-errors' -- - Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' - Target os: 'QEMU' - Target arch: 'mips64' - Compiler: 'GCC' - Features: ['DisableTests', 'UseLegacyInstructions'] - Environment variables: ['QT_QUICK_BACKEND=software'] - Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-mips64/sysroots/x86_64-pokysdk-linux/usr/bin/mips64-poky-linux/mips64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-mips64/sysroots/mips64r2-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-mips64/sysroots/mips64r2-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-feature-forkfd_pidfd -no-warnings-are-errors' -- - Template: 'qtci-windows-10-x86_64-52' - Compiler: 'Mingw' - Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] - Features: ['DisableTests', 'UseLegacyInstructions'] - Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib' -- - Template: 'qtci-windows-10-x86_64-52' - Target os: 'Android_ANY' - Target arch: 'multi' - Compiler: 'Mingw' - Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] - Target compiler: 'Clang' - Features: ['DisableTests', 'UseLegacyInstructions'] - Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r21d' - Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'GCC' diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index 0f20ad3f..4acb84b0 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -1,17 +1,6 @@ Version: 2 Include: [cmake_platforms.yaml] Configurations: -- - Template: 'qtci-linux-openSUSE-15.2-x86_64-50' - Target os: 'WebAssembly' - Compiler: 'GCC' - Features: ['DisableTests', 'UseLegacyInstructions'] - Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -developer-build -static -nomake tests -nomake examples -no-pch -no-feature-thread -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -xplatform wasm-emscripten' -- - Template: 'qtci-macos-10.14-x86_64' - Compiler: 'Clang' - Features: ['UseLegacyInstructions'] - Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -no-pch -no-framework -qtnamespace TestNamespace -nomake tests -nomake examples -I/usr/local/opt/openssl/include' - Template: 'qtci-macos-10.14-x86_64' Compiler: 'Clang' diff --git a/coin/platform_configs/qtdeclarative.yaml b/coin/platform_configs/qtdeclarative.yaml index d82313b5..4d3e24c5 100644 --- a/coin/platform_configs/qtdeclarative.yaml +++ b/coin/platform_configs/qtdeclarative.yaml @@ -1,11 +1,6 @@ Version: 2 Include: [cmake_platforms.yaml] Configurations: -- - Template: 'qtci-macos-10.14-x86_64' - Compiler: 'Clang' - Features: ['UseLegacyInstructions'] - Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -no-pch -no-framework -qtnamespace TestNamespace -nomake tests -nomake examples -I/usr/local/opt/openssl/include' - Template: 'qtci-macos-10.14-x86_64' Compiler: 'Clang' diff --git a/coin/platform_configs/qtsdk.yaml b/coin/platform_configs/qtsdk.yaml deleted file mode 100644 index 8c35a8d0..00000000 --- a/coin/platform_configs/qtsdk.yaml +++ /dev/null @@ -1,15 +0,0 @@ -- - Template: 'qtci-windows-10-x86-4' - Compiler: 'MSVC2019' - Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests' - Features: ['UseLegacyInstructions'] -- - Template: 'qtci-linux-CentOS-8.1-x86_64-50' - Compiler: 'GCC' - Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -force-debug-info -nomake examples -nomake tests' - Features: ['UseLegacyInstructions'] -- - Template: 'qtci-windows-8.1-x86' - Compiler: 'MSVC2015' - Features: ['DisableTests', 'UseLegacyInstructions'] - Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests' diff --git a/coin/platform_configs/tqtc-qt-rta.yaml b/coin/platform_configs/tqtc-qt-rta.yaml deleted file mode 100644 index 72194899..00000000 --- a/coin/platform_configs/tqtc-qt-rta.yaml +++ /dev/null @@ -1,11 +0,0 @@ -Version: 2 -Configurations: -- Template: 'qtci-windows-8.1-x86_64' - Compiler: 'MSVC2013' - Features: ['DisableTests', 'UseLegacyInstructions'] - Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests' -- - Template: 'qtci-windows-10-x86-4' - Compiler: 'MSVC2019' - Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests' - Features: ['UseLegacyInstructions']