From 188bfa777efaf4174260eb291b9a7425a35c8241 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 9 Aug 2022 07:27:14 +0300 Subject: Provisioning: Update MSVC 2019 version to 16.11.18 in Tier 1 Older version seems to have issues with installer when updating the visual studio and buildtools versions through installer via command line. Task-number: QTQAINFRA-5090 Change-Id: Iaec5391ed7bc9780374a7f971624522dae2feee6 Reviewed-by: Qt CI Bot Reviewed-by: Oliver Wolff (cherry picked from commit 0507008ff656f2989e9649293c49b76880bd9406) Reviewed-by: Heikki Halmet --- coin/platform_configs/cmake_platforms.yaml | 10 +++--- .../qtci-windows-11_21H2-x86_64/99-msvc2019.ps1 | 36 ---------------------- 2 files changed, 5 insertions(+), 41 deletions(-) delete mode 100644 coin/provisioning/qtci-windows-11_21H2-x86_64/99-msvc2019.ps1 diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 8c9a5037..5fcf67a4 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -56,7 +56,7 @@ Configurations: Features: ['Sccache', 'DisableTests'] Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DFEATURE_sql_mysql=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' - - Template: 'qtci-windows-11_21H2-x86_64-51' + Template: 'qtci-windows-11_21H2-x86_64-52' Compiler: 'MSVC2019' Features: ['Packaging', 'Sccache', "DebugAndRelease"] Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_headersclean=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache' @@ -99,7 +99,7 @@ Configurations: Configure arguments: '-G"Ninja Multi-Config" -DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF' - Id: 'Windows11_21H2-MSVC2019-x64-host' - Template: 'qtci-windows-11_21H2-x86_64-51' + Template: 'qtci-windows-11_21H2-x86_64-52' Compiler: 'MSVC2019' Features: ['Sccache', "DebugAndRelease"] Configure arguments: '-G"Ninja Multi-Config" -DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache' @@ -107,7 +107,7 @@ Configurations: 'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] - - Template: 'qtci-windows-11_21H2-x86_64-51' + Template: 'qtci-windows-11_21H2-x86_64-52' Compiler: 'MSVC2019' Target arch: 'arm64' Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging'] @@ -165,7 +165,7 @@ Configurations: ] - Id: 'Windows11_21H2-LLVM-x64-host' - Template: 'qtci-windows-11_21H2-x86_64-51' + Template: 'qtci-windows-11_21H2-x86_64-52' Compiler: 'Clang' Features: ['Sccache'] Configure arguments: '-GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..' @@ -180,7 +180,7 @@ Configurations: Environment variables: ['Path=C:\llvm-mingw\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF', 'LLVM_INSTALL_DIR=C:\llvm-mingw'] - - Template: 'qtci-windows-11_21H2-x86_64-51' + Template: 'qtci-windows-11_21H2-x86_64-52' Compiler: 'Mingw' Features: ['Sccache'] Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DQT_BUILD_EXAMPLES=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF' diff --git a/coin/provisioning/qtci-windows-11_21H2-x86_64/99-msvc2019.ps1 b/coin/provisioning/qtci-windows-11_21H2-x86_64/99-msvc2019.ps1 deleted file mode 100644 index c65290df..00000000 --- a/coin/provisioning/qtci-windows-11_21H2-x86_64/99-msvc2019.ps1 +++ /dev/null @@ -1,36 +0,0 @@ -############################################################################# -## -## Copyright (C) 2020 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$ -## -############################################################################# - -# MSVC 2019 and Build Tools are pre-provisioned, but the updating happens with: -. "$PSScriptRoot\..\common\windows\update-msvc2019.ps1" - -- cgit v1.2.3