mirror of https://github.com/qt/qt5.git
Remove packaging flag from CentOS targets
This will also remove CentOS target under QtCreator and RHEL's Insignificant flags from submodules Task-number: QTQAINFRA-4416 Change-Id: I2e6d910dfbba7a7903b149f5cf0bc3386cd4e3e2 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
This commit is contained in:
parent
0d3d17d388
commit
1ebec86732
|
@ -88,7 +88,7 @@ Configurations:
|
|||
Id: 'CentOS-8.3-host'
|
||||
Template: 'qtci-linux-CentOS-8.3-x86_64-50'
|
||||
Compiler: 'GCC'
|
||||
Features: ['Packaging', 'Sccache']
|
||||
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 -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DOpenGL_GL_PREFERENCE=LEGACY'
|
||||
Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
|
||||
'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
|
||||
|
|
|
@ -7,7 +7,7 @@ Configurations:
|
|||
Compiler: 'GCC'
|
||||
Target compiler: 'Clang'
|
||||
Platform dependency: 'CentOS-8.3-host'
|
||||
Features: ['Packaging', 'Sccache', 'DisableTests']
|
||||
Features: ['Sccache', 'DisableTests']
|
||||
Environment variables: [
|
||||
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
|
||||
'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
|
||||
|
@ -18,7 +18,7 @@ Configurations:
|
|||
Compiler: 'GCC'
|
||||
Target compiler: 'Clang'
|
||||
Platform dependency: 'CentOS-8.3-host'
|
||||
Features: ['Packaging', 'Sccache', 'DisableTests']
|
||||
Features: ['Sccache', 'DisableTests']
|
||||
Environment variables: [
|
||||
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=armeabi-v7a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
|
||||
'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
|
||||
|
@ -29,7 +29,7 @@ Configurations:
|
|||
Compiler: 'GCC'
|
||||
Target compiler: 'Clang'
|
||||
Platform dependency: 'CentOS-8.3-host'
|
||||
Features: ['Packaging', 'Sccache', 'DisableTests']
|
||||
Features: ['Sccache', 'DisableTests']
|
||||
Environment variables: [
|
||||
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
|
||||
'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
|
||||
|
@ -40,7 +40,7 @@ Configurations:
|
|||
Compiler: 'GCC'
|
||||
Target compiler: 'Clang'
|
||||
Platform dependency: 'CentOS-8.3-host'
|
||||
Features: ['Packaging', 'Sccache', 'DisableTests']
|
||||
Features: ['Sccache', 'DisableTests']
|
||||
Environment variables: [
|
||||
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86_64 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
|
||||
'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
|
||||
|
|
|
@ -15,12 +15,12 @@ Configurations:
|
|||
-
|
||||
Template: 'qtci-linux-CentOS-8.3-x86_64-50'
|
||||
Compiler: 'GCC'
|
||||
Features: ['Packaging', 'UseLegacyInstructions']
|
||||
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 -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -openssl -qt-harfbuzz QMAKE_LFLAGS_APP+=-s -static -no-icu'
|
||||
-
|
||||
Template: 'qtci-linux-RHEL-8.2-x86_64-50'
|
||||
Compiler: 'GCC'
|
||||
Features: ['Packaging', 'UseLegacyInstructions', 'Insignificant']
|
||||
Features: ['Packaging', 'UseLegacyInstructions']
|
||||
Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -openssl -qt-harfbuzz QMAKE_LFLAGS_APP+=-s -static -no-icu'
|
||||
-
|
||||
Template: 'qtci-linux-Ubuntu-18.04-x86_64-50'
|
||||
|
|
|
@ -24,7 +24,7 @@ Configurations:
|
|||
]
|
||||
Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'x86']
|
||||
-
|
||||
Template: 'qtci-linux-CentOS-8.3-x86_64-50'
|
||||
Template: 'qtci-linux-RHEL-8.2-x86_64-50'
|
||||
Compiler: 'GCC'
|
||||
Features: ['Packaging', 'Sccache', 'DisableTests']
|
||||
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 -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DOpenGL_GL_PREFERENCE=LEGACY'
|
||||
|
|
|
@ -11,7 +11,7 @@ Configurations:
|
|||
Compiler: 'GCC'
|
||||
Target compiler: 'Clang'
|
||||
Platform dependency: 'CentOS-8.3-host'
|
||||
Features: ['Packaging', 'Sccache', 'AndroidTestRun']
|
||||
Features: ['Sccache', 'AndroidTestRun']
|
||||
Environment variables: [
|
||||
'TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
|
||||
'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
|
||||
|
@ -22,7 +22,7 @@ Configurations:
|
|||
Compiler: 'GCC'
|
||||
Target compiler: 'Clang'
|
||||
Platform dependency: 'RHEL-8.2-host'
|
||||
Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'Insignificant']
|
||||
Features: ['Packaging', 'Sccache', 'AndroidTestRun']
|
||||
Environment variables: [
|
||||
'TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
|
||||
'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
|
||||
|
|
|
@ -15,12 +15,12 @@ Configurations:
|
|||
-
|
||||
Template: 'qtci-linux-CentOS-8.3-x86_64-50'
|
||||
Compiler: 'GCC'
|
||||
Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
|
||||
Features: ['DisableTests', 'UseLegacyInstructions']
|
||||
Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -no-opengl -qpa offscreen -no-xcb -qt-libpng -no-vulkan'
|
||||
-
|
||||
Template: 'qtci-linux-RHEL-8.2-x86_64-50'
|
||||
Compiler: 'GCC'
|
||||
Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions', 'Insignificant']
|
||||
Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
|
||||
Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -no-opengl -qpa offscreen -no-xcb -qt-libpng -no-vulkan'
|
||||
-
|
||||
Template: 'qtci-linux-Ubuntu-18.04-x86_64-50'
|
||||
|
|
|
@ -29,7 +29,7 @@ Configurations:
|
|||
-
|
||||
Template: 'qtci-linux-RHEL-8.2-x86_64-50'
|
||||
Compiler: 'GCC'
|
||||
Features: ['UseLegacyInstructions', 'Insignificant']
|
||||
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 -qt-pcre -openssl -qt-harfbuzz -R . QMAKE_LFLAGS_APP+=-s'
|
||||
-
|
||||
Template: 'qtci-macos-10.14-x86_64'
|
||||
|
|
Loading…
Reference in New Issue