aboutsummaryrefslogtreecommitdiffstats
path: root/coin
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2021-11-30 13:18:58 +0200
committerHeikki Halmet <heikki.halmet@qt.io>2021-12-13 09:16:43 +0200
commitb730181404e2bab57754878de9cbec10144a9cee (patch)
tree0cbe151e29668e62670f355ad38119314e024ece /coin
parentac1cd90010bb4e08450407fc5e725cdb829ae3f4 (diff)
Remove Rhel 8.2 targets
Rhel 8.4 is already in use Task-number: QTQAINFRA-4515 Change-Id: I32bba97143adb5243e5ba500eceaad9723a7209e Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Diffstat (limited to 'coin')
-rw-r--r--coin/platform_configs/cmake_platforms.yaml8
-rw-r--r--coin/platform_configs/cmake_platforms_target_android_host_linux.yaml52
-rw-r--r--coin/platform_configs/flashing-wizard.yaml5
-rw-r--r--coin/platform_configs/qtbase.yaml13
-rw-r--r--coin/platform_configs/qtsaferenderer.yaml5
5 files changed, 0 insertions, 83 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml
index 38dcd20b..03380e53 100644
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -149,14 +149,6 @@ Configurations:
'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
-
- Id: 'RHEL-8.2-host'
- Template: 'qtci-linux-RHEL-8.2-x86_64-50'
- Compiler: 'GCC'
- Features: ['Packaging', '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'
- Environment variables: [
- 'CONAN_PROFILE=coin/conan/profiles/linux-x86_64-gcc']
--
Id: 'RHEL-8.4-host'
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Compiler: 'GCC'
diff --git a/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml b/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml
index 19a4bed6..402cbfda 100644
--- a/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml
+++ b/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml
@@ -1,19 +1,6 @@
Version: 2
Configurations:
-
- Template: 'qtci-linux-RHEL-8.2-x86_64-50'
- Target os: 'Android_ANY'
- Target arch: 'arm64'
- Compiler: 'GCC'
- Target compiler: 'Clang'
- Platform dependency: 'RHEL-8.2-host'
- Features: ['Packaging', '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_ROOT}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
- 'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
- 'CONAN_PROFILE=coin/conan/profiles/unix-android-arm64-clang'
- ]
--
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'arm64'
@@ -27,19 +14,6 @@ Configurations:
'CONAN_PROFILE=coin/conan/profiles/unix-android-arm64-clang'
]
-
- Template: 'qtci-linux-RHEL-8.2-x86_64-50'
- Target os: 'Android_ANY'
- Target arch: 'armv7'
- Compiler: 'GCC'
- Target compiler: 'Clang'
- Platform dependency: 'RHEL-8.2-host'
- Features: ['Packaging', '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_ROOT}} -DANDROID_ABI=armeabi-v7a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
- 'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
- 'CONAN_PROFILE=coin/conan/profiles/unix-android-armv7-clang'
- ]
--
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'armv7'
@@ -53,19 +27,6 @@ Configurations:
'CONAN_PROFILE=coin/conan/profiles/unix-android-armv7-clang'
]
-
- Template: 'qtci-linux-RHEL-8.2-x86_64-50'
- Target os: 'Android_ANY'
- Target arch: 'x86'
- Compiler: 'GCC'
- Target compiler: 'Clang'
- Platform dependency: 'RHEL-8.2-host'
- Features: ['Packaging', '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_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
- 'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
- 'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang'
- ]
--
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'x86'
@@ -79,19 +40,6 @@ Configurations:
'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang'
]
-
- Template: 'qtci-linux-RHEL-8.2-x86_64-50'
- Target os: 'Android_ANY'
- Target arch: 'x86_64'
- Compiler: 'GCC'
- Target compiler: 'Clang'
- Platform dependency: 'RHEL-8.2-host'
- Features: ['Packaging', '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_ROOT}} -DANDROID_ABI=x86_64 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
- 'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
- 'CONAN_PROFILE=coin/conan/profiles/unix-android-x86_64-clang'
- ]
--
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'x86_64'
diff --git a/coin/platform_configs/flashing-wizard.yaml b/coin/platform_configs/flashing-wizard.yaml
index 0a4f41ec..b974602a 100644
--- a/coin/platform_configs/flashing-wizard.yaml
+++ b/coin/platform_configs/flashing-wizard.yaml
@@ -24,11 +24,6 @@ Configurations:
Features: ['Packaging', 'UseLegacyInstructions', 'Insignificant']
Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -static -no-icu'
-
- Template: 'qtci-linux-RHEL-8.2-x86_64-50'
- Compiler: 'GCC'
- 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-RHEL-8.4-x86_64-50'
Compiler: 'GCC'
Features: ['Packaging', 'UseLegacyInstructions']
diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml
index 4203709c..480e2c4e 100644
--- a/coin/platform_configs/qtbase.yaml
+++ b/coin/platform_configs/qtbase.yaml
@@ -8,19 +8,6 @@ Include: [
]
Configurations:
-
- Template: 'qtci-linux-RHEL-8.2-x86_64-50'
- Target os: 'Android_ANY'
- Target arch: 'x86'
- Compiler: 'GCC'
- Target compiler: 'Clang'
- Platform dependency: 'RHEL-8.2-host'
- 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_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
- 'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
- 'CONAN_INSTALL_DIR={{.InstallDir}}/target',
- 'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang']
--
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'x86'
diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml
index a7fb9741..d759946a 100644
--- a/coin/platform_configs/qtsaferenderer.yaml
+++ b/coin/platform_configs/qtsaferenderer.yaml
@@ -19,11 +19,6 @@ Configurations:
Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions', 'Insignificant']
Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++'
-
- Template: 'qtci-linux-RHEL-8.2-x86_64-50'
- Compiler: 'GCC'
- 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-RHEL-8.4-x86_64-50'
Compiler: 'GCC'
Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']