From d1d36cbbf181cd9d5f63950265db23d39a6375f5 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Thu, 22 Jun 2017 14:49:39 +0200 Subject: Add Documentation feature to one Ubuntu 14.04 build When creating packages, we build the docs on one configuration. Previously that was done by magic inside the continuous integration system. Make it a bit less magic by having a flag for it. Change-Id: Iee5be7037023929b319beffaacb1592dc87d6078 Reviewed-by: Simon Hausmann --- coin/platform_configs/default.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin/platform_configs/default.txt') diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 3da4c983..b1e90fc4 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -11,7 +11,7 @@ qtci-windows-10-x86_64-7 MSVC2015 qtci-windows-8-x86_64-2 Windows_Phone_8_1 armv4 MSVC2013 Packaging DebugAndRelease Release DisableTests qtci-windows-8-x86_64-2 WinRT_8_1 MSVC2013 Packaging DebugAndRelease Release DisableTests qtci-linux-Ubuntu-14.04-x86_64-1 GCC NoWidgets ForceDebugInfo -qtci-linux-Ubuntu-14.04-x86_64-1 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace +qtci-linux-Ubuntu-14.04-x86_64-1 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace Documentation qtci-linux-OpenSuSE-13.01-x86_64 GCC DeveloperBuild NoPch qtci-linux-RHEL-6.6-x86_64 GCC Packaging Release NoUseGoldLinker qtci-osx-10.11-x86_64 Clang Packaging DebugAndRelease Release -- cgit v1.2.3 From bd3ddeddd256557a8b0820f0958b630347344c25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Thu, 29 Jun 2017 13:46:35 +0300 Subject: Make CI use a new win 8.1 provisioning instead of win 8 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 8 template. Made all the Windows platforms use the scripts under provisioning/common/ instead of duplicate files. Task-number: QTQAINFRA-1357 Change-Id: Ic3f0b50079b212437fff711379f243753ab84872 Reviewed-by: Simon Hausmann --- coin/platform_configs/default.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'coin/platform_configs/default.txt') diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index b1e90fc4..57820fcc 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -1,17 +1,17 @@ Template Target OS Target arch Compiler Features ----------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-8-x86_64-2 MSVC2013 DeveloperBuild Release BuildExamples -qtci-windows-8-x86_64-2 MSVC2012 DeveloperBuild Release QtNamespace QtLibInfix +qtci-windows-8.1-x86_64 MSVC2013 DeveloperBuild Release BuildExamples +qtci-windows-8.1-x86_64 MSVC2012 DeveloperBuild Release QtNamespace QtLibInfix qtci-windows-8-x86-2 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic -qtci-windows-8-x86_64-2 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic +qtci-windows-8.1-x86_64 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic qtci-windows-7-x86-2 MSVC2010 Release DeveloperBuild QtNamespace QtLibInfix OpenGLDynamic qtci-windows-7-x86-2 Mingw49 Packaging DebugAndRelease Release OpenGLDynamic qtci-windows-10-x86-6 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic qtci-windows-10-x86_64-7 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic -qtci-windows-8-x86_64-2 Windows_Phone_8_1 armv4 MSVC2013 Packaging DebugAndRelease Release DisableTests -qtci-windows-8-x86_64-2 WinRT_8_1 MSVC2013 Packaging DebugAndRelease Release DisableTests qtci-linux-Ubuntu-14.04-x86_64-1 GCC NoWidgets ForceDebugInfo qtci-linux-Ubuntu-14.04-x86_64-1 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace Documentation +qtci-windows-8.1-x86_64 Windows_Phone_8_1 armv4 MSVC2013 Packaging DebugAndRelease Release DisableTests +qtci-windows-8.1-x86_64 WinRT_8_1 MSVC2013 Packaging DebugAndRelease Release DisableTests qtci-linux-OpenSuSE-13.01-x86_64 GCC DeveloperBuild NoPch qtci-linux-RHEL-6.6-x86_64 GCC Packaging Release NoUseGoldLinker qtci-osx-10.11-x86_64 Clang Packaging DebugAndRelease Release -- cgit v1.2.3