summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJędrzej Nowacki <jedrzej.nowacki@qt.io>2017-07-12 16:04:19 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2017-07-18 11:44:27 +0000
commit8b9a8c489f8670a3be7cf30d2cfc224fb95c1144 (patch)
treef31b63bf07f2e517024382fc062c279a3af6691d
parent1bdbe06c82051abbe7028c5f2babe586c94eb302 (diff)
Use updated Ubuntu 16.04 in CI
The system packages in the base template were updated via apt-get on 12.07.2017. We hoped that it will solve mysterious problem of a network interface being randomly disabled. Sadly we had no luck, but getting all security updates also make sense. Change-Id: Id11eead39cf1c8a04c054c19b323f752e797fd12 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r--coin/platform_configs/default.txt8
-rw-r--r--coin/platform_configs/qtdeclarative.txt6
2 files changed, 7 insertions, 7 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt
index c82a0feb..7ee4df05 100644
--- a/coin/platform_configs/default.txt
+++ b/coin/platform_configs/default.txt
@@ -7,8 +7,8 @@ qtci-windows-10-x86_64-7 x86 MSVC2015
qtci-windows-10-x86_64-7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-windows-10-x86_64-7 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86_64-7 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-linux-Ubuntu-16.04-x86_64 GCC NoWidgets ForceDebugInfo
-qtci-linux-Ubuntu-16.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace
+qtci-linux-Ubuntu-16.04-x86_64-1 GCC NoWidgets ForceDebugInfo
+qtci-linux-Ubuntu-16.04-x86_64-1 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace
qtci-linux-openSUSE-42.1-x86_64 GCC DeveloperBuild NoPch
qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo
qtci-linux-RHEL-7.2-x86_64 GCC Packaging Release NoUseGoldLinker
@@ -18,6 +18,6 @@ qtci-osx-10.10-x86_64 Clang
qtci-osx-10.10-x86_64 Clang Release NoFramework DisableTests
qtci-osx-10.10-x86_64 IOS_ANY x86_64 Clang Release DisableTests Static
qtci-linux-RHEL-7.2-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-linux-Ubuntu-16.04-x86_64 Boot2Qt_Jethro armv7 GCC Release
-qtci-linux-Ubuntu-16.04-x86_64 GCC TestOnly LicenseCheck
+qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Jethro armv7 GCC Release
+qtci-linux-Ubuntu-16.04-x86_64-1 GCC TestOnly LicenseCheck
qtci-linux-RHEL-7.2-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
diff --git a/coin/platform_configs/qtdeclarative.txt b/coin/platform_configs/qtdeclarative.txt
index c7552671..c8ac9c47 100644
--- a/coin/platform_configs/qtdeclarative.txt
+++ b/coin/platform_configs/qtdeclarative.txt
@@ -1,3 +1,3 @@
-Template Target OS Target arch Compiler Features
-------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
-qtci-linux-Ubuntu-16.04-x86_64 Boot2Qt_Jethro x86_64 GCC DeveloperBuild
+Template Target OS Target arch Compiler Features
+--------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
+qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Jethro x86_64 GCC DeveloperBuild