aboutsummaryrefslogtreecommitdiffstats
path: root/coin/provisioning/qtci-windows-10-x86_64
diff options
context:
space:
mode:
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86_64')
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/01-change-resolution.ps13
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/02-python-32bit.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/02-python.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/06-longpath.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/09-install-openssh.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/25-llvm-mingw.ps152
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/90-install-virtualbox.ps142
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/90-mimersql.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/92-protobuf.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/96-disable-windows-module-installer.ps1 (renamed from coin/provisioning/qtci-windows-10-x86_64/98-disable-windows-module-installer.ps1)0
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/97-msvc2015.ps110
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/97-msvc2019.ps16
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/98-unset-proxy.ps1 (renamed from coin/provisioning/qtci-windows-10-x86_64/99-unset-proxy.ps1)0
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/99-msvc2015.ps146
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/99-msvc2019.ps142
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/99-share-test-folders.ps11
16 files changed, 37 insertions, 173 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-change-resolution.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-change-resolution.ps1
index 679769a8..c1e73a62 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/01-change-resolution.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/01-change-resolution.ps1
@@ -22,4 +22,7 @@ Function ChangeResolution {
Write-Host "Changing the resolution to ${x_value}x${y_value}"
ChangeResolution "MSBDD_NOEDID_1234_1111_00000000_00020000_0^E3701873EC28AFCFF631E725354CDC2D"
ChangeResolution "MSBDD_NOEDID_15AD_0405_00000000_000F0000_0^C13AE38966E73205F75BFACA84EB83A5"
+ChangeResolution "MSBDD_RHT12340_2A_07DE_3A_1234_1111_00000000_00020000_0^EC6E4468E7627A114F1F86EA72F3C134"
+ChangeResolution "MSBDD_RHT12340_2A_07DE_3D_1234_1111_00000000_00010000_0^4189234F4C5A30C0FE2E08AED7E5F516"
+ChangeResolution "MSBDD_RHT12340_2A_07DE_3D_1234_1111_00000000_00020000_0^0E45B5CD7061674FC90A8064A6FE81F4"
ChangeResolution "MSNILNOEDID_1414_008D_FFFFFFFF_FFFFFFFF_0^030B4FCE00727AC1593E5B6FD18648D6"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-python-32bit.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-python-32bit.ps1
deleted file mode 100644
index bd2d52c3..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/02-python-32bit.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\windows\python.ps1" 32 "C:\Python27_32"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-python.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-python.ps1
deleted file mode 100644
index e2e9be9c..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/02-python.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\windows\python.ps1" 64
diff --git a/coin/provisioning/qtci-windows-10-x86_64/06-longpath.ps1 b/coin/provisioning/qtci-windows-10-x86_64/06-longpath.ps1
new file mode 100644
index 00000000..6561d57b
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/06-longpath.ps1
@@ -0,0 +1,2 @@
+. "$PSScriptRoot\..\common\windows\longpath.ps1"
+
diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-openssh.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-openssh.ps1
new file mode 100644
index 00000000..9de844da
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-openssh.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\install-openssh.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/25-llvm-mingw.ps1 b/coin/provisioning/qtci-windows-10-x86_64/25-llvm-mingw.ps1
index 5dd90b70..adc2c506 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/25-llvm-mingw.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/25-llvm-mingw.ps1
@@ -1,55 +1,19 @@
-#############################################################################
-##
-## Copyright (C) 2021 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$
-##
-#############################################################################
+# Copyright (C) 2021 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
. "$PSScriptRoot\..\common\windows\helpers.ps1"
# This script installs LLVM-Mingw by mstorsjo
-$zip = Get-DownloadLocation "llvm-mingw-20220209-ucrt-x86_64.zip"
-$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/llvm-mingw-20220209-ucrt-x86_64.zip"
-$url_official = "https://github.com/mstorsjo/llvm-mingw/releases/download/20220209/llvm-mingw-20220209-ucrt-x86_64.zip"
+$zip = Get-DownloadLocation "llvm-mingw-20220906-ucrt-x86_64.zip"
+$url_cache = "http://ci-files01-hki.ci.qt.io/input/windows/llvm-mingw-20220906-ucrt-x86_64.zip"
+$url_official = "https://github.com/mstorsjo/llvm-mingw/releases/download/20220906/llvm-mingw-20220906-ucrt-x86_64.zip"
Download $url_official $url_cache $zip
-Verify-Checksum $zip "e24078c0d742b39eef4d739b345a0b6b49bc348b"
+Verify-Checksum $zip "51ff525eefa4f5db905cc7b4c8b56079c3baed65"
Extract-7Zip $zip C:\
-Rename-Item C:\llvm-mingw-20220209-ucrt-x86_64 C:\llvm-mingw
+Rename-Item C:\llvm-mingw-20220906-ucrt-x86_64 C:\llvm-mingw
-Write-Output "llvm-mingw = 14.0.0 RC1" >> ~/versions.txt
+Write-Output "llvm-mingw = 15.0.0" >> ~/versions.txt
Remove-Item -Path $zip
diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-install-virtualbox.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-install-virtualbox.ps1
index fc4ce546..bf14fd23 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/90-install-virtualbox.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/90-install-virtualbox.ps1
@@ -1,41 +1,5 @@
-############################################################################
-##
-## Copyright (C) 2017 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$
-##
-#############################################################################
+# Copyright (C) 2017 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
. "$PSScriptRoot\..\common\windows\helpers.ps1"
@@ -43,7 +7,7 @@
$version = "5.2.4"
$sha1 = "71df4474a5e94918728b62d1f6bc036674ef0e96"
-$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\VirtualBox-" + $version + "-119785-Win.exe"
+$url_cache = "\\ci-files01-hki.ci.qt.io\provisioning\windows\VirtualBox-" + $version + "-119785-Win.exe"
$url_official = "http://download.virtualbox.org/virtualbox/" + $version + "/VirtualBox-" + $version + "-119785-Win.exe"
$virtualboxPackage = "C:\Windows\Temp\virtualbox-$version.exe"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-mimersql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-mimersql.ps1
new file mode 100644
index 00000000..576dd9d2
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/90-mimersql.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\mimersql.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/92-protobuf.ps1 b/coin/provisioning/qtci-windows-10-x86_64/92-protobuf.ps1
new file mode 100644
index 00000000..c455bce7
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/92-protobuf.ps1
@@ -0,0 +1,2 @@
+. "$PSScriptRoot\..\common\windows\protobuf.ps1"
+
diff --git a/coin/provisioning/qtci-windows-10-x86_64/98-disable-windows-module-installer.ps1 b/coin/provisioning/qtci-windows-10-x86_64/96-disable-windows-module-installer.ps1
index fb8ec541..fb8ec541 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/98-disable-windows-module-installer.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/96-disable-windows-module-installer.ps1
diff --git a/coin/provisioning/qtci-windows-10-x86_64/97-msvc2015.ps1 b/coin/provisioning/qtci-windows-10-x86_64/97-msvc2015.ps1
new file mode 100644
index 00000000..2f458f75
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/97-msvc2015.ps1
@@ -0,0 +1,10 @@
+# Copyright (C) 2020 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+# Visual Studios are pre-provisioned to tier1 images
+
+# MSVC 2015 Update 3
+Write-Output "Visual Studio 2015 = Version 14.0.25420.1 Update 3" >> ~\versions.txt
+
+# 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-x86_64/97-msvc2019.ps1 b/coin/provisioning/qtci-windows-10-x86_64/97-msvc2019.ps1
new file mode 100644
index 00000000..96f0a2d3
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/97-msvc2019.ps1
@@ -0,0 +1,6 @@
+# Copyright (C) 2020 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+# 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-x86_64/99-unset-proxy.ps1 b/coin/provisioning/qtci-windows-10-x86_64/98-unset-proxy.ps1
index 0c25a0fb..0c25a0fb 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/99-unset-proxy.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/98-unset-proxy.ps1
diff --git a/coin/provisioning/qtci-windows-10-x86_64/99-msvc2015.ps1 b/coin/provisioning/qtci-windows-10-x86_64/99-msvc2015.ps1
deleted file mode 100644
index 5ecf031e..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/99-msvc2015.ps1
+++ /dev/null
@@ -1,46 +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$
-##
-#############################################################################
-
-# Visual Studios are pre-provisioned to tier1 images
-
-# MSVC 2015 Update 3
-Write-Output "Visual Studio 2015 = Version 14.0.25420.1 Update 3" >> ~\versions.txt
-
-# 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-x86_64/99-msvc2019.ps1 b/coin/provisioning/qtci-windows-10-x86_64/99-msvc2019.ps1
deleted file mode 100644
index 4f048086..00000000
--- a/coin/provisioning/qtci-windows-10-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"
-
diff --git a/coin/provisioning/qtci-windows-10-x86_64/99-share-test-folders.ps1 b/coin/provisioning/qtci-windows-10-x86_64/99-share-test-folders.ps1
new file mode 100644
index 00000000..576fcfdc
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/99-share-test-folders.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\share-test-folders.ps1"