aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2022-02-16 09:42:33 +0200
committerHeikki Halmet <heikki.halmet@qt.io>2022-02-22 08:04:21 +0200
commit7ba1b4a454fd398050bdfe909b454fd727eb06e9 (patch)
tree3dcbd5b7b62d8feba6a300a98b618e6b2a2c855c
parentd542683972359e22c1c292d51e2dd31f9cdd2143 (diff)
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 <oliver.wolff@qt.io> (cherry picked from commit 1597f435123dfffbc2d7c14cc0a730d65c60387a) Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
-rw-r--r--coin/provisioning/qtci-windows-10_21H2-x86_64/01-msvc2019.ps142
-rw-r--r--coin/provisioning/qtci-windows-10_21H2-x86_64/99-msvc2019.ps136
2 files changed, 42 insertions, 36 deletions
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 c65290df..00000000
--- a/coin/provisioning/qtci-windows-10_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"
-