From ed8d1c76ae4a88d4e73b575c07fbc625e5b8e22c Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 16 Feb 2022 09:42:33 +0200 Subject: Provisioning: Run msvc 2019 update at the beginning of provisioning When script was run with prefix 99 the installation process wasn't finished before machine got rebooted. Moving the script at beginning of provisioning seems to help with the situation. This is not a proper fix but the best we have right now. We can change this later if/when we find the root cause for this. Task-number: QTQAINFRA-4813 Change-Id: Icbc2b0b33905990df611bdb494ed9b22801633fd Reviewed-by: Oliver Wolff (cherry picked from commit 1597f435123dfffbc2d7c14cc0a730d65c60387a) Reviewed-by: Qt Cherry-pick Bot --- .../qtci-windows-10_21H2-x86_64/01-msvc2019.ps1 | 42 ++++++++++++++++++++++ .../qtci-windows-10_21H2-x86_64/99-msvc2019.ps1 | 42 ---------------------- 2 files changed, 42 insertions(+), 42 deletions(-) create mode 100644 coin/provisioning/qtci-windows-10_21H2-x86_64/01-msvc2019.ps1 delete mode 100644 coin/provisioning/qtci-windows-10_21H2-x86_64/99-msvc2019.ps1 diff --git a/coin/provisioning/qtci-windows-10_21H2-x86_64/01-msvc2019.ps1 b/coin/provisioning/qtci-windows-10_21H2-x86_64/01-msvc2019.ps1 new file mode 100644 index 00000000..f8a0150c --- /dev/null +++ b/coin/provisioning/qtci-windows-10_21H2-x86_64/01-msvc2019.ps1 @@ -0,0 +1,42 @@ +############################################################################# +## +## Copyright (C) 2022 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL$ +## 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 https://www.qt.io/terms-conditions. For further +## information use the contact form at https://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 3 as published by the Free Software +## Foundation and appearing in the file LICENSE.LGPL3 included in the +## packaging of this file. Please review the following information to +## ensure the GNU Lesser General Public License version 3 requirements +## will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 2.0 or (at your option) the GNU General +## Public license version 3 or any later version approved by the KDE Free +## Qt Foundation. The licenses are as published by the Free Software +## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-2.0.html and +## https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# MSVC 2019 and Build Tools are pre-provisioned, but the updating happens with: +. "$PSScriptRoot\..\common\windows\update-msvc2019.ps1" + diff --git a/coin/provisioning/qtci-windows-10_21H2-x86_64/99-msvc2019.ps1 b/coin/provisioning/qtci-windows-10_21H2-x86_64/99-msvc2019.ps1 deleted file mode 100644 index 4f048086..00000000 --- a/coin/provisioning/qtci-windows-10_21H2-x86_64/99-msvc2019.ps1 +++ /dev/null @@ -1,42 +0,0 @@ -############################################################################# -## -## Copyright (C) 2020 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL$ -## 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 https://www.qt.io/terms-conditions. For further -## information use the contact form at https://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 3 as published by the Free Software -## Foundation and appearing in the file LICENSE.LGPL3 included in the -## packaging of this file. Please review the following information to -## ensure the GNU Lesser General Public License version 3 requirements -## will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 2.0 or (at your option) the GNU General -## Public license version 3 or any later version approved by the KDE Free -## Qt Foundation. The licenses are as published by the Free Software -## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-2.0.html and -## https://www.gnu.org/licenses/gpl-3.0.html. -## -## $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