From f1276acf5c5cfcccffb50a04a58a8974d2d2121e Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 16 Oct 2019 14:53:42 +0300 Subject: [PATCH 01/17] Provisioning: Add MSVC 2019 and upgrade MSVC 2017 to the latest version Under coin/pre-provisioning can be found information what have been provisioned to tier1 image Visual studios are updated to versions: MSVC 2019: version 16.3.1 MSVC 2017: version 15.9.16 Task-number: QTQAINFRA-2875 Change-Id: I3a9748296dcf088bb312dec8f78bdc59dfb281d1 Reviewed-by: Jani Heikkinen --- coin/platform_configs/default.yaml | 23 +++-- coin/platform_configs/qt5.yaml | 20 ++-- coin/platform_configs/qtbase.yaml | 2 +- coin/platform_configs/qtconnectivity.yaml | 2 +- coin/platform_configs/qtsaferenderer.yaml | 4 +- .../README_MANUAL_INSTALLATIONS | 11 +++ .../disable-defragment.ps1 | 72 +++++++++++++++ .../qtci-windows-10-x86_64/disable-ntp.ps1 | 4 + .../disable-schedule-tasks.ps1 | 0 .../disable-update-orchestrator.ps1 | 0 .../disable-windefender.ps1 | 59 ++++++++++++ .../disable-windows-file-protector.ps1 | 0 .../disable-windows-update-medic.ps1 | 0 .../disable-windows-updates.ps1 | 54 +++++++++++ .../qtci-windows-10-x86_64/msvc2017.ps1 | 3 +- .../qtci-windows-10-x86_64/msvc2019.ps1 | 91 +++++++++++++++++++ .../00-disable-windefender.ps1 | 1 - .../02-disable-defragment.ps1 | 1 - .../qtci-windows-10-x86_64/02-disable-ntp.ps1 | 1 - .../02-disable-windows-updates.ps1 | 1 - .../98-disable-file-protector.ps1 | 1 - .../98-disable-schedule-tasks.ps1 | 1 - .../98-disable-update-orchestrator.ps1 | 1 - .../98-disable-windows-update-medic.ps1 | 2 - 24 files changed, 324 insertions(+), 30 deletions(-) create mode 100644 coin/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS create mode 100644 coin/pre-provisioning/qtci-windows-10-x86_64/disable-defragment.ps1 create mode 100644 coin/pre-provisioning/qtci-windows-10-x86_64/disable-ntp.ps1 rename coin/{provisioning/common/windows => pre-provisioning/qtci-windows-10-x86_64}/disable-schedule-tasks.ps1 (100%) rename coin/{provisioning/common/windows => pre-provisioning/qtci-windows-10-x86_64}/disable-update-orchestrator.ps1 (100%) create mode 100644 coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1 rename coin/{provisioning/common/windows => pre-provisioning/qtci-windows-10-x86_64}/disable-windows-file-protector.ps1 (100%) rename coin/{provisioning/common/windows => pre-provisioning/qtci-windows-10-x86_64}/disable-windows-update-medic.ps1 (100%) create mode 100644 coin/pre-provisioning/qtci-windows-10-x86_64/disable-windows-updates.ps1 create mode 100644 coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/00-disable-windefender.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/02-disable-defragment.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/02-disable-ntp.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/02-disable-windows-updates.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/98-disable-file-protector.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/98-disable-schedule-tasks.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/98-disable-update-orchestrator.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/98-disable-windows-update-medic.ps1 diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 8b054f95..1177086a 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -2,7 +2,7 @@ Version: 2 Module only: True Configurations: - - Template: 'qtci-windows-10-x86_64-14' + Template: 'qtci-windows-10-x86_64-15' Compiler: 'MSVC2015' Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -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% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%' @@ -11,35 +11,46 @@ Configurations: Compiler: 'Mingw73' Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-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% -platform win32-g++' - - Template: 'qtci-windows-10-x86_64-14' + Template: 'qtci-windows-10-x86_64-15' Target arch: 'x86' Compiler: 'MSVC2017' Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -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%' - - Template: 'qtci-windows-10-x86_64-14' + Template: 'qtci-windows-10-x86_64-15' + Target arch: 'x86' + Compiler: 'MSVC2019' + Features: ['DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -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%' +- + Template: 'qtci-windows-10-x86_64-15' Compiler: 'MSVC2015' Features: ['Packaging', 'DisableTests'] Configure arguments: '-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_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%' - - Template: 'qtci-windows-10-x86_64-14' + Template: 'qtci-windows-10-x86_64-15' Target os: 'WinRT_10' Target arch: 'x86' Compiler: 'MSVC2015' Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x86-msvc2015' - - Template: 'qtci-windows-10-x86_64-14' + Template: 'qtci-windows-10-x86_64-15' Target os: 'WinRT_10' Target arch: 'armv7' Compiler: 'MSVC2015' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-arm-msvc2015' - - Template: 'qtci-windows-10-x86_64-14' + Template: 'qtci-windows-10-x86_64-15' Compiler: 'MSVC2017' Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%' +- + Template: 'qtci-windows-10-x86_64-15' + Compiler: 'MSVC2019' + Features: ['DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index 02f3b719..e1d20a71 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -1,11 +1,11 @@ - - Template: 'qtci-windows-10-x86_64-14' + Template: 'qtci-windows-10-x86_64-15' Target os: 'WinRT_10' Compiler: 'MSVC2015' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x64-msvc2015' - - Template: 'qtci-windows-10-x86_64-14' + Template: 'qtci-windows-10-x86_64-15' Target os: 'WinRT_10' Target arch: 'x86' Compiler: 'MSVC2017' @@ -17,25 +17,25 @@ Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-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% -platform win32-g++' - - Template: 'qtci-windows-10-x86_64-14' + Template: 'qtci-windows-10-x86_64-15' Compiler: 'Mingw73' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++' - - Template: 'qtci-windows-10-x86_64-14' + Template: 'qtci-windows-10-x86_64-15' Target os: 'WinRT_10' Target arch: 'armv7' Compiler: 'MSVC2017' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-arm-msvc2017' - - Template: 'qtci-windows-10-x86_64-14' + Template: 'qtci-windows-10-x86_64-15' Target os: 'WinRT_10' Compiler: 'MSVC2017' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-x64-msvc2017' - - Template: 'qtci-windows-10-x86_64-14' + Template: 'qtci-windows-10-x86_64-15' Target os: 'Android_ANY' Target arch: 'multi' Compiler: 'Mingw73' @@ -58,21 +58,21 @@ Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -extprefix /Users/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-qcc' - - Template: 'qtci-windows-10-x86_64-14' + Template: 'qtci-windows-10-x86_64-15' Target os: 'QNX_700' Target arch: 'armv7' Compiler: 'Mingw73' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc' - - Template: 'qtci-windows-10-x86_64-14' + Template: 'qtci-windows-10-x86_64-15' Target os: 'QNX_700' Target arch: 'armv8' Compiler: 'Mingw73' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc' - - Template: 'qtci-windows-10-x86_64-14' + Template: 'qtci-windows-10-x86_64-15' Target os: 'QNX_700' Target arch: 'x86_64' Compiler: 'Mingw73' @@ -93,7 +93,7 @@ Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-64-qcc' - - Template: 'qtci-windows-10-x86_64-14' + Template: 'qtci-windows-10-x86_64-15' Target os: 'WebAssembly' Compiler: 'Mingw73' Features: ['Packaging', 'DisableTests'] diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index fae959fc..22e16db9 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -13,7 +13,7 @@ Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib' - - Template: 'qtci-windows-10-x86_64-14' + Template: 'qtci-windows-10-x86_64-15' Target os: 'WinRT_10' Target arch: 'x86_64' Compiler: 'MSVC2015' diff --git a/coin/platform_configs/qtconnectivity.yaml b/coin/platform_configs/qtconnectivity.yaml index 782d6bce..13daa23d 100644 --- a/coin/platform_configs/qtconnectivity.yaml +++ b/coin/platform_configs/qtconnectivity.yaml @@ -1,5 +1,5 @@ - - Template: 'qtci-windows-10-x86_64-14' + Template: 'qtci-windows-10-x86_64-15' Target os: 'WinRT_10' Target arch: 'x86_64' Compiler: 'MSVC2015' diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index 7051900b..be14923b 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -1,9 +1,9 @@ - - Template: 'qtci-windows-10-x86_64-14' + Template: 'qtci-windows-10-x86_64-15' Compiler: 'Mingw73' Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -nomake tests -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% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++' - - Template: 'qtci-windows-10-x86_64-14' + Template: 'qtci-windows-10-x86_64-15' Compiler: 'Mingw73' Features: ['Packaging', 'DisableTests'] Configure arguments: '-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++' diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS b/coin/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS new file mode 100644 index 00000000..2d85d8f8 --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS @@ -0,0 +1,11 @@ +# List about manual pre-installations to Tier1 image: + +Vmware tools: installed +Resolution: 1280 X 800 +Coin setup (installed boostrap agent, disabled fast boot, disabled firewall (both public and private), disabled UAC, enabled autologin) +Remote Desktop Connection: enabled +Timezone: set to UTC +Administrator tools - services - Windows search: stop & disable +Power settings screen & slee: never +Turn windows features on or off -> Check the "SMB 1.0/CIFS File Sharing Support" + diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-defragment.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-defragment.ps1 new file mode 100644 index 00000000..e76f0649 --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-defragment.ps1 @@ -0,0 +1,72 @@ +############################################################################# +## +## Copyright (C) 2019 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# Windows 7 does not have Get-ScheduledTask and Unregister-ScheduledTask +# thus needing its own version. +Write-Host "Disabling defragmentation" +$version = Get-CimInstance Win32_OperatingSystem | Select-Object -ExpandProperty Caption +if ($version -like '*Windows 7*'){ + $pi = New-Object System.Diagnostics.ProcessStartInfo + $pi.FileName = "C:\Windows\System32\schtasks.exe" + $pi.RedirectStandardError = $true + $pi.UseShellExecute = $false + $pi.Arguments = "/Delete /TN `"\Microsoft\Windows\Defrag\ScheduledDefrag`" /F" + $prog = New-Object System.Diagnostics.Process + $prog.StartInfo = $pi + $prog.Start() | Out-Null + $err = $prog.StandardError.ReadToEnd() + $prog.WaitForExit() + if ($prog.ExitCode -eq 0){ + Write-Host "Scheduled defragmentation removed" + } else { + if ($err -like '*cannot find the file*'){ + Write-Host "No scheduled defragmentation task found" + exit 0 + } else { + Write-Host "Error while deleting scheduled defragmentation task: $err" + } + } +} +else { + try { + $state = (Get-ScheduledTask -ErrorAction Stop -TaskName "ScheduledDefrag").State + Write-Host "Scheduled defragmentation task found in state: $state" + } + catch { + Write-Host "No scheduled defragmentation task found" + exit 0 + } + Write-Host "Unregistering scheduled defragmentation task" + Unregister-ScheduledTask -ErrorAction Stop -Confirm:$false -TaskName ScheduledDefrag + Write-Host "Scheduled Defragmentation task was cancelled" +} diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-ntp.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-ntp.ps1 new file mode 100644 index 00000000..757f0d18 --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-ntp.ps1 @@ -0,0 +1,4 @@ +. "$PSScriptRoot\helpers.ps1" + +# Disable the NTP from syncing +Run-Executable "w32tm.exe" "/config /syncfromflags:NO" diff --git a/coin/provisioning/common/windows/disable-schedule-tasks.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-schedule-tasks.ps1 similarity index 100% rename from coin/provisioning/common/windows/disable-schedule-tasks.ps1 rename to coin/pre-provisioning/qtci-windows-10-x86_64/disable-schedule-tasks.ps1 diff --git a/coin/provisioning/common/windows/disable-update-orchestrator.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-update-orchestrator.ps1 similarity index 100% rename from coin/provisioning/common/windows/disable-update-orchestrator.ps1 rename to coin/pre-provisioning/qtci-windows-10-x86_64/disable-update-orchestrator.ps1 diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1 new file mode 100644 index 00000000..02ed54da --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1 @@ -0,0 +1,59 @@ +########################################################################### +## +## Copyright (C) 2019 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# Turning off win defender. +# +# If disabled manually, windows will automatically enable it after +# some period of time. Disabling it speeds up the builds. + +. "$PSScriptRoot\helpers.ps1" + +Run-Executable "reg.exe" "ADD `"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender`" /V DisableAntiSpyware /T REG_dWORD /D 1 /F" + +# 'Windows Defender Cache Maintenance' - "Periodic maintenance task." +DisableSchedulerTask "Windows Defender\Windows Defender Cache Maintenance" + +# 'Windows Defender Cleanup' - "Periodic cleanup task." +DisableSchedulerTask "Windows Defender\Windows Defender Cleanup" + +# 'Windows Defender Scheduled Scan' - "Periodic scan task." +DisableSchedulerTask "Windows Defender\Windows Defender Scheduled Scan" + +# 'Windows Defender Verification' - "Periodic verification task." +DisableSchedulerTask "Windows Defender\Windows Defender Verification" + +# Disable 'QueueReporting' - "Windows Error Reporting task to process queued reports." +DisableSchedulerTask "Windows Error Reporting\QueueReporting" + +# Disable WindowsUpdate from Task Scheduler +DisableSchedulerTask "WindowsUpdate\Scheduled Start" diff --git a/coin/provisioning/common/windows/disable-windows-file-protector.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windows-file-protector.ps1 similarity index 100% rename from coin/provisioning/common/windows/disable-windows-file-protector.ps1 rename to coin/pre-provisioning/qtci-windows-10-x86_64/disable-windows-file-protector.ps1 diff --git a/coin/provisioning/common/windows/disable-windows-update-medic.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windows-update-medic.ps1 similarity index 100% rename from coin/provisioning/common/windows/disable-windows-update-medic.ps1 rename to coin/pre-provisioning/qtci-windows-10-x86_64/disable-windows-update-medic.ps1 diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windows-updates.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windows-updates.ps1 new file mode 100644 index 00000000..87414f03 --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windows-updates.ps1 @@ -0,0 +1,54 @@ +############################################################################ +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# This script disables the automatic Windows updates + +$service = get-service wuauserv +if (-not $service) { + Write-Host "Windows Update service not found." + exit 0 +} + +if ($service.Status -eq "Stopped") { + Write-Host "Windows Update service already stopped." +} else { + Write-Host "Stopping Windows Update service." + Stop-Service -Name "wuauserv" -Force +} + +$startup = Get-WmiObject Win32_Service | Where-Object {$_.Name -eq "wuauserv"} | Select -ExpandProperty "StartMode" +if ($startup -ne "Disabled") { + set-service wuauserv -startup disabled +} else { + Write-Host "Windows Update service startup already disabled." +} diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 index cc0dbd85..e4cf9bf3 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 @@ -34,7 +34,8 @@ # Visual Studio $version version $version_number was installed manually using $installer. $version = "2017" -$version_number = "15.8.5" +# Current version was manually upgraded from the installer +$version_number = "15.9.16" $installer = "http://ci-files01-hki.ci.local/input/windows/vs_professional__1312218103.1526017942.exe" # Following components were selected from installer: diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.ps1 new file mode 100644 index 00000000..77242a21 --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.ps1 @@ -0,0 +1,91 @@ +############################################################################ +## +## Copyright (C) 2019 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# Visual Studio $version version $version_number was installed manually using $installer. + +$version = "2019" +# Current version was manually upgraded from the installer +$version_number = "16.3.2" +$installer = "http://ci-files01-hki.ci.local/input/windows/vs_professional__505064367.1547034421.exe" + +.NET Framework 4.5 targeting pack +.NET Framework 4.5.1 targeting pack +.NET Framework 4.5.2 targeting pack +.NET Framework 4.6.1 SDK +.NET Framework 4.6.1 targeting pack +.NET Framework 4.6.2 SDK +.NET Framework 4.6.2 targeting pack +.NET Framework 4.7.2 SDK +.NET Framework 4.7.2 targeting pack +.NET Native +.NET Portable Library targeting pack +CLR data typer for SQL Sever +Connectivity and publishing tools +Data sources for SQL Server support +SQL ADAL runtime +SQL Server Command Linne Utilities +SQL Server Data Tools +SQL Server Express 2016 LocalDB +SQL Server ODBC Driver +ClickOnce Publishing +Developer Analytics tools +NuGet package manager +Text Template Transformation +C# and Visual Basic Roslyn compilers +C++ 2019 Redistributable Update +C++ Cmake tools for Windows +C++/CLI support for v142 build tools +MSBuild +MSVC v142 - VS 2019 C++ ARM build tools (v14.20) +MSVC v142 - VS 2019 C++ ARM64 build tools (v14.20) +MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.20) +.NET profiling tools +C++ profiling tools +JavaScript diagnostics +Just-In-Time debugger +C# and Visual Basic +C++ core features +JavaSript and TypeScript language support +Razor Language Services +Graphics debugger and GPU profiler for DirectX +Image and 3D model editors +C++ ATL for v142 build tools (x86 & x64) +TypeScript 3.3 SDK +Windows 10 SDK (10.0.16299.0) +Windows 10 SDK (10.0.17134.0) +Windows 10 SDK (10.0.17763.0) +Windows 10 SDK (10.0.18362.0) + +# NOTE! Work loads were added during installation! + +echo "Visual Studio = $version version version_number" >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/00-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86_64/00-disable-windefender.ps1 deleted file mode 100644 index 8f94b3d5..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/00-disable-windefender.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-windefender.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-disable-defragment.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-disable-defragment.ps1 deleted file mode 100644 index 10518401..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/02-disable-defragment.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-defragment.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-disable-ntp.ps1 deleted file mode 100644 index ee3b3b7d..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/02-disable-ntp.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-ntp.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-disable-windows-updates.ps1 deleted file mode 100644 index 57428310..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/02-disable-windows-updates.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-windows-updates.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/98-disable-file-protector.ps1 b/coin/provisioning/qtci-windows-10-x86_64/98-disable-file-protector.ps1 deleted file mode 100644 index 79802f24..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/98-disable-file-protector.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-windows-file-protector.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/98-disable-schedule-tasks.ps1 b/coin/provisioning/qtci-windows-10-x86_64/98-disable-schedule-tasks.ps1 deleted file mode 100644 index 9134a735..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/98-disable-schedule-tasks.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-schedule-tasks.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/98-disable-update-orchestrator.ps1 b/coin/provisioning/qtci-windows-10-x86_64/98-disable-update-orchestrator.ps1 deleted file mode 100644 index 67dcce60..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/98-disable-update-orchestrator.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-update-orchestrator.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/98-disable-windows-update-medic.ps1 b/coin/provisioning/qtci-windows-10-x86_64/98-disable-windows-update-medic.ps1 deleted file mode 100644 index 7a6ab935..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/98-disable-windows-update-medic.ps1 +++ /dev/null @@ -1,2 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-windows-update-medic.ps1" - From e4cb75c5aef1de77624e0640f7fa285a8b7cd02b Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 6 Nov 2019 19:35:28 +0100 Subject: [PATCH 02/17] Update submodules on '5.14' in qt/qt5 Only qtwebengine this round. Change-Id: Ib8ec9d5d290245917892cf2585e80a422dfc8daf Reviewed-by: Liang Qi --- qtwebengine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtwebengine b/qtwebengine index 58bc9211..296469f8 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 58bc92115febfa332e9f2ebe0f06a01b5a679416 +Subproject commit 296469f8ecef1f4d10cf8c24237fe9397b41f306 From 569fd1dabc47dccd80331d4f380eae811fd07447 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 11 Nov 2019 14:24:36 +0200 Subject: [PATCH 03/17] Provisioning: Install pre-builded openssl for Windows 7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-3224 Change-Id: I972b497e1a98f2ebbb6633158714409313cf0506 Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 index f90938c4..269771c7 100644 --- a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 @@ -43,10 +43,10 @@ # nmake install -$version = "1.1.1b" +$version = "1.1.1d" $zip = Get-DownloadLocation ("openssl-$version.7z") -$sha1 = "7afba53ab984cecb54a1915c135cbb2a20c6b576" -$url = "http://ci-files01-hki.intra.qt.io/input/openssl/openssl_${version}_prebuild_x86.7z" +$sha1 = "2bf9379c4cea81858c4288cf06cc3444996bcad5" +$url = "http://ci-files01-hki.intra.qt.io/input/openssl/openssl_${version}_prebuild_x86_windows7_msvc2010.zip" Download $url $url $zip Verify-Checksum $zip $sha1 @@ -55,6 +55,8 @@ $installFolder = "C:\openssl" Extract-7Zip $zip "C:\" Remove-Item -Path $zip +Move-Item -Path C:\openssl_${version}_prebuild_x86_windows7_msvc2010 -Destination C:\openssl + Set-EnvironmentVariable "OPENSSL_CONF_x86" "$installFolder\openssl.cnf" Set-EnvironmentVariable "OPENSSL_INCLUDE_x86" "$installFolder\include" Set-EnvironmentVariable "OPENSSL_LIB_x86" "$installFolder\lib" From 6cc2215b8ce6da477cf23f01ff5b88c0d12c2b88 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Tue, 5 Nov 2019 12:09:12 +0100 Subject: [PATCH 04/17] DownloadURL last argument (targetFile) is now optional MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I0864bcb052cddcc9753c056758b6e65fd561d928 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/unix/DownloadURL.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/common/unix/DownloadURL.sh b/coin/provisioning/common/unix/DownloadURL.sh index ac1fd971..5bafc33d 100755 --- a/coin/provisioning/common/unix/DownloadURL.sh +++ b/coin/provisioning/common/unix/DownloadURL.sh @@ -89,7 +89,14 @@ DownloadURL () { url=$1 url2=$2 expectedHash=$3 - targetFile=$4 + # Optional argument $4: destination filename + if [ x"$4" = x ] + then + # defaults to the last component of $url + targetFile=$(echo $url | sed 's|^.*/||') + else + targetFile=$4 + fi if VerifyHash "$targetFile" "$expectedHash" then From fafd3d655d4ebb303825cb40203ecf39f3b0e578 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Tue, 5 Nov 2019 15:37:32 +0100 Subject: [PATCH 05/17] Fix cache URL for telegraf windows package Fixes: QTQAINFRA-3340 Change-Id: Ie7bad3666094e3f8f8e8971c2bfe05457ca6cd45 Reviewed-by: Heikki Halmet --- coin/provisioning/common/windows/install_telegraf.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/windows/install_telegraf.ps1 b/coin/provisioning/common/windows/install_telegraf.ps1 index 258c6c59..fee550b1 100644 --- a/coin/provisioning/common/windows/install_telegraf.ps1 +++ b/coin/provisioning/common/windows/install_telegraf.ps1 @@ -49,7 +49,7 @@ if (Is64BitWinHost) { $filename = "telegraf-" + $version + "_windows_" + $arch + ".zip" -$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\" + $filename +$url_cache = "http://ci-files01-hki.intra.qt.io/input/telegraf/" + $filename $url_official = "https://dl.influxdata.com/telegraf/releases/" + $filename $tempfile = "C:\Windows\Temp\" + $filename From a270bcdb6beb34d7590378899805391cfcfe7091 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Tue, 5 Nov 2019 12:45:45 +0100 Subject: [PATCH 06/17] Docker installation: do not depend on external repositories MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also updated the docker-compose binary to the latest one. Task-number: QTQAINFRA-3279 Change-Id: Ie09a772ca8247aa5f5bd6d36774b68b6bb846386 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/linux/docker.sh | 37 ++++++++++++++++++------ 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/coin/provisioning/common/linux/docker.sh b/coin/provisioning/common/linux/docker.sh index 1d9e8419..127239d1 100755 --- a/coin/provisioning/common/linux/docker.sh +++ b/coin/provisioning/common/linux/docker.sh @@ -35,18 +35,37 @@ set -ex -# Download and install the docker engine. -sudo apt-get install curl -y -curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - -sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" -sudo apt-get update -sudo apt-get install docker-ce -y + +. $(dirname "$0")/../../common/unix/DownloadURL.sh + + +localRepo=http://ci-files01-hki.intra.qt.io/input/docker +upstreamRepo=https://download.docker.com/linux/ubuntu/dists/bionic/pool/stable/amd64 + +echo ' + f4c941807310e3fa470dddfb068d599174a3daec containerd.io_1.2.10-3_amd64.deb + ee640d9258fd4d3f4c7017ab2a71da63cbbead55 docker-ce_19.03.4~3-0~ubuntu-bionic_amd64.deb + 09402bf5dac40f0c50f1071b17f38f6584a42ad1 docker-ce-cli_19.03.4~3-0~ubuntu-bionic_amd64.deb +' \ + | xargs -n2 | while read sha f +do + DownloadURL $localRepo/$f $upstreamRepo/$f $sha +done + +sudo apt-get -y install ./containerd.io*.deb ./docker-ce*.deb ./docker-ce-cli*.deb +rm -f ./containerd.io*.deb ./docker-ce*.deb ./docker-ce-cli*.deb + sudo usermod -a -G docker $USER sudo docker info -# Download and install the docker-compose extension. -sudo curl -L https://github.com/docker/compose/releases/download/1.21.0/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose -sudo chmod +x /usr/local/bin/docker-compose +# Download and install the docker-compose extension from https://github.com/docker/compose/releases +f=docker-compose-$(uname -s)-$(uname -m) +DownloadURL \ + $localRepo/$f \ + https://github.com/docker/compose/releases/download/1.24.1/$f \ + cfb3439956216b1248308141f7193776fcf4b9c9b49cbbe2fb07885678e2bb8a +sudo install -m 755 ./docker-compose* /usr/local/bin/docker-compose +rm ./docker-compose* # Install Avahi to discover Docker containers in the test network sudo apt-get install avahi-daemon -y From 33d254781788ae145075da53534741587be036a5 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Tue, 5 Nov 2019 17:30:46 +0100 Subject: [PATCH 07/17] Keep debug trace off to avoid polluting the logs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I8a2d878a52b5e0a818d7f80fff495feca84d0e9c Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/linux/docker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/linux/docker.sh b/coin/provisioning/common/linux/docker.sh index 127239d1..08303700 100755 --- a/coin/provisioning/common/linux/docker.sh +++ b/coin/provisioning/common/linux/docker.sh @@ -33,7 +33,7 @@ ## ############################################################################# -set -ex +set -e . $(dirname "$0")/../../common/unix/DownloadURL.sh From ef7481b9cd514d0e3d73c5211193d1d100acfe74 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Wed, 13 Nov 2019 19:55:51 +0100 Subject: [PATCH 08/17] Workaround broken local apt mirror MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Local mirror is mirroring a public mirror, and for some reason there is a mismatch of file sizes and file hashes for the dep-11 metadata files. More info: https://askubuntu.com/questions/823329/how-do-i-disable-fetching-of-dep-11-files Task-number: QTQAINFRA-3351 Change-Id: Ia48936e7d0b9efb2f86fbe001f22f2bd28a7ea3d Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh index e7cf5c3d..89b1eb7f 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh @@ -46,6 +46,10 @@ for service in apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-dai done function set_internal_repo { + + # Stop fetching the dep-11 metadata, since our mirrors do not handle them well + sudo mv /etc/apt/apt.conf.d/50appstream{,.disabled} + sudo tee "/etc/apt/sources.list" > /dev/null <<-EOC deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic main restricted universe multiverse deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic-updates main restricted universe multiverse From 4728ffb6200846145e9bfb5d0d6713698921ffc7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 13 Nov 2019 21:02:03 +0100 Subject: [PATCH 09/17] Update submodules on '5.13' in qt/qt5 Change-Id: I7ba7a20377d5fbe2b390ec1aeed82e74eb974eba Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt3d b/qt3d index 51b09ca0..b33b615f 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 51b09ca0b2506f3cdfd025511a68888ed959b6d5 +Subproject commit b33b615f4a4ac4d61bbce320783d5cca6edd91d1 diff --git a/qtbase b/qtbase index 39ed657b..30f4ca4e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 39ed657b6393c850735857e367303800f1a04413 +Subproject commit 30f4ca4e4fbc1d8cf86808dbeb00ec3c046f6c1c diff --git a/qtdeclarative b/qtdeclarative index 15d1b173..c89f7a22 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 15d1b173d030f5ae5ca72f511d33c80979503268 +Subproject commit c89f7a221b7c31a0a4e1b0eed2e91d7633f4eab2 diff --git a/qtdoc b/qtdoc index 62dbc6b4..fe230a19 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 62dbc6b4a1608bf75c00b90b6da60785c2e8fc89 +Subproject commit fe230a199306888f11ac62e8a056f64048943906 diff --git a/qtimageformats b/qtimageformats index 9fe1f2e9..ba1fb21b 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 9fe1f2e918d39031852805f1add23125c061d3c3 +Subproject commit ba1fb21bc61a2075c7fd058e7f7ba5caf7d2f400 diff --git a/qtmultimedia b/qtmultimedia index b64bdf32..f9a57682 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit b64bdf32ce10b039e8d7b1be18d001e89f315615 +Subproject commit f9a576826c0d770aaae8aadbedaf83e1c0b72e0a diff --git a/qtqa b/qtqa index 62a653d3..b9a30637 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 62a653d32176956365f1fe8b5cb148a6391a6c9d +Subproject commit b9a306372a17a22e1907bbd5911f819d4911bb87 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 5c1aa494..0622cb60 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 5c1aa494e95b2945500e3c3e62240dd60e7190d6 +Subproject commit 0622cb603869484c93acf6369965ec2eabd9ef6f diff --git a/qttranslations b/qttranslations index 36022c8e..828c7105 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 36022c8e9263c1940710cd214965979e9bd8a036 +Subproject commit 828c710556718257bbfd52fbcd4bdf55dc567b08 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 28596bc3..730dba4a 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 28596bc340ac335a2759099c83db30d5c761d151 +Subproject commit 730dba4a4741b18b94377ff94d894c3245dd63ef diff --git a/qtwayland b/qtwayland index 62e959ea..2493c8b6 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 62e959eaa707a163daca69a42c733bbd272d41d6 +Subproject commit 2493c8b6600f2617848007ee9592c71361b432fe diff --git a/qtwebengine b/qtwebengine index 5e4487c2..6e79d033 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 5e4487c2d9c72c54269db5fe8f333c75479ccb5f +Subproject commit 6e79d033a30f9d56b72a5aa4cc9a02cf656e2fe5 From 40cca42c393577dbf85d4752eea50da207380907 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Wed, 13 Nov 2019 16:27:53 +0100 Subject: [PATCH 10/17] Use macOS 10.14 to build iOS/tvOS/watchOS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Allows us to (as a follow-up) use Xcode 11. Change-Id: I799732eee35eea3db83e568d26ded6e7ae1df53d Reviewed-by: Tony Sarajärvi --- coin/platform_configs/default.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 1177086a..1b99b7da 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -106,21 +106,21 @@ Configurations: Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -no-pch -no-framework -qtnamespace TestNamespace -nomake tests -nomake examples -I/usr/local/opt/openssl/include' - - Template: 'qtci-macos-10.13-x86_64-2' + Template: 'qtci-macos-10.14-x86_64' Target os: 'IOS_ANY' Target arch: 'multi' Compiler: 'Clang' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -no-icu -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -static -xplatform macx-ios-clang' - - Template: 'qtci-macos-10.13-x86_64-2' + Template: 'qtci-macos-10.14-x86_64' Target os: 'TvOS_ANY' Target arch: 'multi' Compiler: 'Clang' Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-tvos-clang' - - Template: 'qtci-macos-10.13-x86_64-2' + Template: 'qtci-macos-10.14-x86_64' Target os: 'WatchOS_ANY' Target arch: 'multi' Compiler: 'Clang' From 6bf7a970e703aa3d88ebfb53f7ba2554faebe489 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Wed, 13 Nov 2019 17:53:45 +0100 Subject: [PATCH 11/17] Use Xcode 11 on macOS 10.14 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: QTQAINFRA-3261 Change-Id: Ibec6b156e030b2a1b91010321178612efc0bd06b Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh | 2 +- .../qtci-macos-10.14-x86_64/21-install-commandlinetools.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh index 2ee4dedf..f0ef3a96 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh @@ -50,4 +50,4 @@ set -ex # shellcheck source=../common/macos/install_xcode.sh source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh" -InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/macos_10.14_mojave/Xcode_10.2.1_update.tar.gz 10.2.1 +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/macos_10.14_mojave/Xcode_11.2.1.tar.gz 11.2.1 diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.14-x86_64/21-install-commandlinetools.sh index 09055ee6..241c4c47 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/21-install-commandlinetools.sh @@ -38,10 +38,10 @@ set -ex # shellcheck source=../common/macos/install-commandlinetools.sh source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" -version="10.2.1" -packageName="Command_Line_Tools_macOS_10.14_for_Xcode_$version.dmg" +version="11.2" +packageName="Command_Line_Tools_for_Xcode_$version.dmg" url="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.14_mojave/$packageName" -sha1="18fea89bb743107aee372a212be608d6e35fdecf" +sha1="04f288e0dce69ddbce52ea707f978afcbf6be107" InstallCommandLineTools $url $url $sha1 $packageName $version From 5d5ef9c32b87740bb0bdb0c6265fd15f96361a11 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Thu, 7 Nov 2019 13:41:51 +0200 Subject: [PATCH 12/17] Enable dSYM files for release builds in macOS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Same flag is used in windows and linux ones and it seems that is needed to enable dSYM files for release builds Task-number: QTBUG-3934 Change-Id: I3f60ea68ba0f4d755e411215efa4cec1d0a46d83 Reviewed-by: Tor Arne Vestbø --- coin/platform_configs/default.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 1b99b7da..c703555c 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -94,12 +94,12 @@ Configurations: Template: 'qtci-macos-10.13-x86_64-2' Compiler: 'Clang' Features: ['Packaging'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -separate-debug-info -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' - Template: 'qtci-macos-10.14-x86_64' Compiler: 'Clang' Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -separate-debug-info -nomake tests -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' - Template: 'qtci-macos-10.14-x86_64' Compiler: 'Clang' From d8eaed9b0987c32ad62b92565933bd80a83e5f92 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 5 Nov 2019 12:25:03 +0200 Subject: [PATCH 13/17] Provisioning: Update Android NDK version to r20 for macOS 10.14 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-3337 Change-Id: Ib14e3cc484198bb23bb611262b205144f8a8ac70 Reviewed-by: Johanna Äijälä --- coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh index 544364b0..1886cce3 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh @@ -51,7 +51,7 @@ toolsVersion="r26.1.1" # toolsFile dertermines tools version toolsFile="sdk-tools-darwin-4333796.zip" -ndkVersion="r19c" +ndkVersion="r20" ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip" sdkBuildToolsVersion="28.0.3" # this is compile sdk version From edb5ebfb7e9cc47c8454b55a8964e8121ef838ea Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 18 Nov 2019 13:38:44 +0100 Subject: [PATCH 14/17] Update submodules on '5.14' in qt/qt5 Change-Id: Ia052f103935e8451e10258315370009b9b24f596 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/qt3d b/qt3d index 906f8a62..31d3ebed 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 906f8a62f89a7ce2343a155e6db62616e66dc14b +Subproject commit 31d3ebed75387b09645fe3f1d36e3b30f686fce3 diff --git a/qtactiveqt b/qtactiveqt index 95f41d5f..3b07b8b2 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 95f41d5f24dab973da0a96641e556fac7ae3fa42 +Subproject commit 3b07b8b2f33b0888e20313f52425012b980831c9 diff --git a/qtandroidextras b/qtandroidextras index 2914af23..57aacdd6 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 2914af23f0691bc04c1bd66faf79b403e68ff8e4 +Subproject commit 57aacdd654a7dec2f8ff412f4f3705d0bd50a0a9 diff --git a/qtbase b/qtbase index d1c6f7e5..54f5b897 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d1c6f7e5a2e0ee6c50bbf0668e44200bd8469a09 +Subproject commit 54f5b8975055f1d48c74efab085acd6338aa1e3c diff --git a/qtcharts b/qtcharts index de7d5543..57b67d63 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit de7d5543ae093b84a6526cad0d8c56fc12f7526f +Subproject commit 57b67d631dee93f6473786f38504da32fb0bb6b8 diff --git a/qtconnectivity b/qtconnectivity index 17621645..355f09ec 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 176216459d84c59bf0cff26203928cfc144f164e +Subproject commit 355f09eccc5ceba421e8c522e04cb7be72fa0a75 diff --git a/qtdeclarative b/qtdeclarative index e87ecaf5..35fdf3a7 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit e87ecaf55291ac38c705dea7eaeb7c58ad0e3284 +Subproject commit 35fdf3a7b77a79806d0b5d9632b5066e3618adf5 diff --git a/qtdoc b/qtdoc index bcb2f180..2f81a81a 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit bcb2f180295962061b0eefcf8010120941200d2a +Subproject commit 2f81a81aac5b6f47e3d40974912917473171597d diff --git a/qtimageformats b/qtimageformats index 8ca5b34c..3d157f97 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 8ca5b34c1aacc4b7a8f20bf9aadd04f1eeafd3f6 +Subproject commit 3d157f9773a2db1a3096a86e5170ace975646ca3 diff --git a/qtlocation b/qtlocation index 0771fa5d..cd7edab9 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 0771fa5d6476f51c1d2c9874be4958e4b37d10e3 +Subproject commit cd7edab940934fe8b100172e3e62e7eea5c354e5 diff --git a/qtmultimedia b/qtmultimedia index a045c989..49bf444b 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit a045c989e15feda1201e81d8c2a7a403c33ad6da +Subproject commit 49bf444b44dac10602af0af862f0951835ea5895 diff --git a/qtqa b/qtqa index 62a653d3..b9a30637 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 62a653d32176956365f1fe8b5cb148a6391a6c9d +Subproject commit b9a306372a17a22e1907bbd5911f819d4911bb87 diff --git a/qtquick3d b/qtquick3d index 8bd8254e..67458dbc 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 8bd8254ee1f3f1f578bb523b43fd949fc22fefd7 +Subproject commit 67458dbc14f3c319976f62a781ce88044fc3e8b3 diff --git a/qtquickcontrols b/qtquickcontrols index 3432dd2a..5d76ced0 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 3432dd2a5ffb19144dae39cb1c728b44a48f04f5 +Subproject commit 5d76ced033cf1b2a1466a1b1b2a3a4f1102fab3f diff --git a/qtquickcontrols2 b/qtquickcontrols2 index dc62583e..2193e993 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit dc62583e8e1f864b8a22fbe79f9fe25ca3a4e9dc +Subproject commit 2193e9938e98af39a16f5035789c555f2574020b diff --git a/qtremoteobjects b/qtremoteobjects index ac6b0b0d..419455bf 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit ac6b0b0d1ca9fe3f6a61e078db9a30eb5dad6da0 +Subproject commit 419455bfe6e51601504d7c2fa5a2a9dff9c20851 diff --git a/qtserialbus b/qtserialbus index 15c618da..545494c6 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 15c618da80a71d0f5c33cdade6535f43eb852363 +Subproject commit 545494c6e7c2441f7fc8c6b7e337189461938b00 diff --git a/qtserialport b/qtserialport index 09fa8225..d4dc8988 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 09fa8225d525b12ba22234a59452decaf987fb8a +Subproject commit d4dc8988c5cfc6e0080e9ef17f8393a6a06cbb98 diff --git a/qtsvg b/qtsvg index 9aeb3523..e489a325 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 9aeb3523a7fc521b725be106b1521335061c43b3 +Subproject commit e489a325769d295ee3b3948d98f5d07814dffd97 diff --git a/qttools b/qttools index c962370b..2b6c9031 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit c962370b3db644bb05c410b2536552466b4eac86 +Subproject commit 2b6c90317b6bc5f94ca0dc14a3a1467aa8019b17 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 0f6d99c6..6547842b 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 0f6d99c67b415169153d90844066226ba4d343d2 +Subproject commit 6547842b5ec6f3f13dc0d9fec6c8e4d167bfb2ce diff --git a/qtwayland b/qtwayland index 4cdfa555..ca8a6e6e 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 4cdfa55502704d13f3d0cc1f2feccd8807e0c1d4 +Subproject commit ca8a6e6ee1c2439dbe439244b61f86cf062f88d5 diff --git a/qtwebchannel b/qtwebchannel index 1f6c72df..48ceec6d 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 1f6c72df8b33741dc798042dd8c2e75f3af46232 +Subproject commit 48ceec6ddb790730a23b5bee847bea5273300103 diff --git a/qtwebengine b/qtwebengine index 296469f8..ce72a40e 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 296469f8ecef1f4d10cf8c24237fe9397b41f306 +Subproject commit ce72a40e91095dd5e1e46713fb94de493ee48d39 diff --git a/qtwebsockets b/qtwebsockets index 88f408f9..5b34b19b 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 88f408f90d760df73c431336ab318b3af66b9572 +Subproject commit 5b34b19b0a37624a3f5846a949112929ef5feeeb diff --git a/qtx11extras b/qtx11extras index b7328240..8dae1423 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit b732824096cd3cf31f7a374aa3b92fa934ff9ecd +Subproject commit 8dae14239247281ce36a9e92308a506f149574db diff --git a/qtxmlpatterns b/qtxmlpatterns index 8bb4665c..9e7745d7 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 8bb4665cccbe0b00cf234917e4fd59394705f46f +Subproject commit 9e7745d7e283570ca8504909d20c39d3aca18cf7 From 601a9d39b2b7b6e3fd0b3504e5c5e460e89c64c2 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 5 Aug 2019 15:48:20 +0300 Subject: [PATCH 15/17] Provisioning: Install python modules needed by packaging Needed by packaging scripts Task-number: COIN-214 Change-Id: I3ac719800c3afd183996379f6c23fbe3f8bcf7cb Reviewed-by: Iikka Eklund --- .../common/unix/python_modules.sh | 38 ++++++++++++++++++ .../90-python-modules.sh | 39 +++++++++++++++++++ .../90-python-modules.sh | 7 ++++ .../90-python-modules.ps1 | 3 ++ 4 files changed, 87 insertions(+) create mode 100755 coin/provisioning/common/unix/python_modules.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-python-modules.sh create mode 100755 coin/provisioning/qtci-macos-10.13-x86_64/90-python-modules.sh create mode 100644 coin/provisioning/qtci-windows-10-x86_64/90-python-modules.ps1 diff --git a/coin/provisioning/common/unix/python_modules.sh b/coin/provisioning/common/unix/python_modules.sh new file mode 100755 index 00000000..dbf26a85 --- /dev/null +++ b/coin/provisioning/common/unix/python_modules.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2019 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# needed by packaging scripts +sudo pip3 install bs4 +sudo pip3 install sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-python-modules.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-python-modules.sh new file mode 100755 index 00000000..8a3fc7b9 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-python-modules.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2019 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +set -ex + +# shellcheck source=../common/unix/python-modules.sh +source "${BASH_SOURCE%/*}/../common/unix/python-modules.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/90-python-modules.sh b/coin/provisioning/qtci-macos-10.13-x86_64/90-python-modules.sh new file mode 100755 index 00000000..8a2cbf64 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/90-python-modules.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/python_modules.sh" + diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-python-modules.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-python-modules.ps1 new file mode 100644 index 00000000..3646d826 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/90-python-modules.ps1 @@ -0,0 +1,3 @@ +# Needed by packaging scripts +C:\Python36\Scripts\pip3 install bs4 +C:\Python36\Scripts\pip3 install sh From 0335e9c4e5fa697b03a4777728e1cedbfd78fd79 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 8 Oct 2019 15:25:04 +0300 Subject: [PATCH 16/17] Provisioning: Remove shell scripts under windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I3d7a949e95bab39adc349c25d267b7fc28e676cf Reviewed-by: Tony Sarajärvi --- .../common/windows/09-install-openssl.sh | 6 --- .../windows/50-openssl_for_android_linux.sh | 39 ------------------- 2 files changed, 45 deletions(-) delete mode 100755 coin/provisioning/common/windows/09-install-openssl.sh delete mode 100755 coin/provisioning/common/windows/50-openssl_for_android_linux.sh diff --git a/coin/provisioning/common/windows/09-install-openssl.sh b/coin/provisioning/common/windows/09-install-openssl.sh deleted file mode 100755 index 4f1d3768..00000000 --- a/coin/provisioning/common/windows/09-install-openssl.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -set -ex - -# shellcheck source=../common/unix/install-openssl.sh -source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "linux" diff --git a/coin/provisioning/common/windows/50-openssl_for_android_linux.sh b/coin/provisioning/common/windows/50-openssl_for_android_linux.sh deleted file mode 100755 index 81ea3b17..00000000 --- a/coin/provisioning/common/windows/50-openssl_for_android_linux.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -############################################################################# -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -set -ex - -# shellcheck source=../common/linux/openssl_for_android_linux.sh -source "${BASH_SOURCE%/*}/../common/linux/openssl_for_android_linux.sh" From dcfef7226fb54288858d234764f15582c77f5b05 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 19 Nov 2019 09:09:21 +0200 Subject: [PATCH 17/17] Provisioning: Change JDK script to use 'Remove' function from helpers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-3369 Change-Id: I2e873eb50d9129c48d92370af80fe121039d172e Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/windows/install-jdk.ps1 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/coin/provisioning/common/windows/install-jdk.ps1 b/coin/provisioning/common/windows/install-jdk.ps1 index 0c548e63..ce1abdd5 100644 --- a/coin/provisioning/common/windows/install-jdk.ps1 +++ b/coin/provisioning/common/windows/install-jdk.ps1 @@ -68,8 +68,7 @@ try { Verify-Checksum $javaPackage $sha1 Run-Executable "$javaPackage" "/s SPONSORS=0" -Write-Host "Cleaning $javaPackage.." -Remove-Item -Recurse -Force -Path "$javaPackage" +Remove "$javaPackage" Write-Host "Remove Java update from startup" reg delete "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Run" /v SunJavaUpdateSched /f