From a26ce5e56a783a2a9ef6353de55d43c3686bc27c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Fri, 19 May 2017 14:27:35 +0300 Subject: Make CI use a new provisioned Win 10 template Added all the provisioning scripts that install required programs and make changes to certain settings. These are needed to build qt5. This replaces the old Windows 10 template. Task-number: QTQAINFRA-1263 Change-Id: I0f3d1072d53eb75f7405cf79139f2919eeb1f716 Reviewed-by: Heikki Halmet --- coin/platform_configs/qt5.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'coin/platform_configs/qt5.txt') diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 727dd7e9..0f6e9e93 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -2,13 +2,13 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-8.1-x86_64 x86 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-8.1-x86_64 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-10-x86_64-7 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-9 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86-6 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-7 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-9 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-9 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-7-x86-2 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-7 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-7 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-9 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-9 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-linux-RHEL-7.2-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-7-x86-2 Android_ANY armv7 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86-2 Android_ANY x86 Mingw53 Packaging Release DisableTests OpenGLES2 @@ -17,7 +17,7 @@ qtci-macos-10.12-x86_64-8 Android_ANY x86 GCC Packagin qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.2-x86_64 QNX_700 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.2-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-10-x86_64-7 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-7 QNX_700 x86 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static +qtci-windows-10-x86_64-9 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-9 QNX_700 x86 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-linux-RHEL-7.2-x86_64 INTEGRITY_11_04 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -- cgit v1.2.3 From 357202801f5bdff61e69539e0ee7d2deee5c5143 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Mon, 7 Aug 2017 09:56:49 +0300 Subject: Make CI use a new RHEL 7.4 provisioning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added all the provisioning scripts that install required programs and make changes to certain settings. These are needed to build qt5. This commit replaces RHEL 7.2 in desktop builds, android builds and INTEGRITY builds. Task-number: QTQAINFRA-1251 Task-number: QTQAINFRA-1252 Task-number: QTQAINFRA-1253 Task-number: QTQAINFRA-1267 Task-number: QTQAINFRA-1269 Change-Id: Icef19df7fb799a4008ccdc0584821c982055e339 Reviewed-by: Tony Sarajärvi --- coin/platform_configs/qt5.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'coin/platform_configs/qt5.txt') diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 0f6e9e93..47d1bd0c 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -9,15 +9,15 @@ qtci-windows-10-x86_64-9 WinRT_10 x86 MSVC2017 Packagin qtci-windows-7-x86-2 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests qtci-windows-10-x86_64-9 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86_64-9 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-linux-RHEL-7.2-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-7-x86-2 Android_ANY armv7 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86-2 Android_ANY x86 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-macos-10.12-x86_64-8 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 qtci-macos-10.12-x86_64-8 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.2-x86_64 QNX_700 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.2-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static qtci-windows-10-x86_64-9 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-9 QNX_700 x86 Mingw53 Packaging Release DisableTests OpenGLES2 -qtci-linux-RHEL-7.2-x86_64 INTEGRITY_11_04 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 QNX_700 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -- cgit v1.2.3 From 3b7b924b31f28c38068e99d4637a90e34362a685 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Thu, 19 Oct 2017 15:53:34 +0300 Subject: Fix Windows 10 x64 Python with new tier 1 Current tier 1 template #9 has python and anaconda installed that came with MSVC2017. This messes with the provisioning scripts and ultimately builds such as pyside, even though qt5 builds go through. Task-number: QTQAINFRA-1503 Change-Id: Id4e1303ba2524373170f1aca7b0c7e66f9f235dc Reviewed-by: Heikki Halmet --- coin/platform_configs/qt5.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'coin/platform_configs/qt5.txt') diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 47d1bd0c..0a4da169 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -2,13 +2,13 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-8.1-x86_64 x86 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-8.1-x86_64 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-10-x86_64-9 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86-6 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-9 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-9 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-7-x86-2 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-9 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-9 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-7-x86-2 Android_ANY armv7 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86-2 Android_ANY x86 Mingw53 Packaging Release DisableTests OpenGLES2 @@ -16,8 +16,8 @@ qtci-macos-10.12-x86_64-8 Android_ANY armv7 GCC Packagin qtci-macos-10.12-x86_64-8 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static -qtci-windows-10-x86_64-9 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-9 QNX_700 x86 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_700 x86 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-linux-RHEL-7.4-x86_64 QNX_700 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -- cgit v1.2.3 From 372d2bb0764724cd5239ad47ad71927eef7ab090 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Sun, 3 Sep 2017 08:30:17 +0300 Subject: Provision vanilla Windows 7 x86 and use it Change-Id: I96eefe2e69b5cbe5d68329be2bb4273d03bb85ca Reviewed-by: Heikki Halmet --- coin/platform_configs/qt5.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'coin/platform_configs/qt5.txt') diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 0a4da169..5eea413c 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -6,12 +6,12 @@ qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packagi qtci-windows-10-x86-6 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-7-x86-2 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests +qtci-windows-7-x86-3 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-7-x86-2 Android_ANY armv7 Mingw53 Packaging Release DisableTests OpenGLES2 -qtci-windows-7-x86-2 Android_ANY x86 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-7-x86-3 Android_ANY armv7 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-7-x86-3 Android_ANY x86 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-macos-10.12-x86_64-8 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 qtci-macos-10.12-x86_64-8 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -- cgit v1.2.3 From 72cc04772620ab7bfa65f5105bbffc2c9092c0bc Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Wed, 27 Sep 2017 14:37:22 +0300 Subject: Fix QNX platform configurations for Qt 5.9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With Qt 5.9 series we still deliver binaries for QNX 6.6 only -> - Add QNX 6.6 platform configurations for windows - Remove 'packaging' flag from QNX 7.0 builds - Add provisioning script to patch QNX in windows 10 as well This change fixes the previous 5.6 merge, where this should've happened. Change-Id: Icf080fa5614371627f8f5245675cb190ebaaf893 Reviewed-by: Simo Fält --- coin/platform_configs/qt5.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'coin/platform_configs/qt5.txt') diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 5eea413c..21c00e9d 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -16,8 +16,10 @@ qtci-macos-10.12-x86_64-8 Android_ANY armv7 GCC Packagin qtci-macos-10.12-x86_64-8 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static -qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_700 x86 Mingw53 Packaging Release DisableTests OpenGLES2 -qtci-linux-RHEL-7.4-x86_64 QNX_700 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw53 Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_700 x86 Mingw53 Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_660 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_660 x86 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-linux-RHEL-7.4-x86_64 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -- cgit v1.2.3