diff options
| author | Tony Sarajärvi <tony.sarajarvi@qt.io> | 2019-02-25 15:38:50 +0200 |
|---|---|---|
| committer | Aapo Keskimolo <aapo.keskimolo@qt.io> | 2019-05-07 07:15:58 +0000 |
| commit | 049eb21a1d6af9c95b1a2b7a33a134dc6abc5433 (patch) | |
| tree | b6bd50e94e3b5ce21f7b2eeb12eb9947b879844f /coin/platform_configs | |
| parent | c6b018a9257a67b4229f07379b6caf7c4971662a (diff) | |
Replace RHEL 7.4 with 7.6 in the CI
Task-number: QTQAINFRA-2942
Change-Id: I4186a2961ce81eed7a7fd8994c4a10f35b8fad1c
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Diffstat (limited to 'coin/platform_configs')
| -rw-r--r-- | coin/platform_configs/default.txt | 10 | ||||
| -rw-r--r-- | coin/platform_configs/qt3d-runtime.txt | 6 | ||||
| -rw-r--r-- | coin/platform_configs/qt5.txt | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 29a20a07..177d9aa6 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -12,17 +12,17 @@ qtci-linux-Ubuntu-18.04-x86_64 GCC qtci-linux-openSUSE-15.0-x86_64 GCC DeveloperBuild NoPch qtci-linux-openSUSE-15.0-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite qtci-linux-openSUSE-15.0-x86_64 WebAssembly GCC Packaging Release NoPch DisableTests -qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo +qtci-linux-RHEL-7.6-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo qtci-macos-10.13-x86_64-2 Clang Packaging DebugAndRelease Release qtci-macos-10.12-x86_64-9 Clang DeveloperBuild NoFramework Release QtNamespace NoPch qtci-macos-10.13-x86_64-2 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static qtci-macos-10.13-x86_64-2 TvOS_ANY multi Clang DebugAndRelease DisableTests qtci-macos-10.13-x86_64-2 WatchOS_ANY multi Clang DebugAndRelease DisableTests -qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.4-x86_64 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.6-x86_64 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.6-x86_64 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC Release qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC Release qtci-linux-Ubuntu-18.04-x86_64 QEMU mips64 GCC Release DisableTests qtci-linux-Ubuntu-18.04-x86_64 GCC TestOnly LicenseCheck -qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.6-x86_64 INTEGRITY_11_04 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.6-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt index 1001d869..314099ab 100644 --- a/coin/platform_configs/qt3d-runtime.txt +++ b/coin/platform_configs/qt3d-runtime.txt @@ -6,7 +6,7 @@ qtci-windows-7-x86-3 Mingw73 qtci-windows-10-x86_64-14 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86_64-14 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.6-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-10-x86_64-14 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-14 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-14 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 @@ -17,5 +17,5 @@ qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC qtci-windows-10-x86_64-14 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-14 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-14 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.6-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.6-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 1001d869..314099ab 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -6,7 +6,7 @@ qtci-windows-7-x86-3 Mingw73 qtci-windows-10-x86_64-14 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86_64-14 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.6-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-10-x86_64-14 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-14 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-14 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 @@ -17,5 +17,5 @@ qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC qtci-windows-10-x86_64-14 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-14 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-14 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.6-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.6-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker |