Compare commits

...

14 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
a92f882ec7 Update submodules on '6.4 in qt/qt5'
Change-Id: I2551b5d02071b6d043aaa62ca35e2af649b83bf3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-30 04:01:28 +00:00
Lorn Potter
30dc3e90e2 wasm: update emsdk to 3.1.14
This fixes some threading bugs

Change-Id: I8025cd96ee5737deb04a571cc35eec8b26820039
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-08-29 14:28:49 +10:00
Tatiana Borisova
2edf643736 Exclude timezone functionality from INTEGRITY build
- Device doesn't support full functionality

Change-Id: Ie0293e9d1ec9c5500e2c63e0c7ff8cc32015a454
Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 41f0e6d7b0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-08-27 06:12:20 +00:00
Heikki Halmet
a833250d59 Update Xcode version to 13.2.1 for macOS 11
This is needed for QTQAINFRA-5109

Task-number: QTQAINFRA-5109
Change-Id: I49dafa26ef2aafe6e1c9f9cab87486675283c305
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit d4602891f2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-08-27 06:12:19 +00:00
Qt Submodule Update Bot
b12068a544 Update submodules on '6.4 in qt/qt5'
Change-Id: I290c9827da230cf43bb03a9995cdb53f6c12c4af
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-25 23:59:52 +00:00
Heikki Halmet
beaa9271a8 Include needed Platform dependency for nightly QNX_710 windows target
Change-Id: I753245ae5641a45286c394cfb2696da6796d664d
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 5af40232de)
2022-08-25 13:01:24 +03:00
Qt Submodule Update Bot
329f8f19ff Update submodules on '6.4 in qt/qt5'
Change-Id: I20c0295da3f6d34083aea73043eec595c623e7fc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-24 17:23:38 +00:00
Heikki Halmet
97b6fc7f0c Fix rmt client setup to repo-clones
Change-Id: I36d8f24b19135345a2829e7521585c0cba9fc41f
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit f794796984)
2022-08-22 10:24:29 +03:00
Simo Fält
8e8e05883e Provisioning: Remove git installation from macOS 10.14
The script uses homebrew which does not support 10.14 anymore and it
fails. The git was installed due to Conan, but with TestOnly config
it does not need git.

Task-number: QTBUG-105554
Change-Id: I542780d32ebd7054c75a6afa357b3fac898b93cb
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit a992ba9205)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-08-22 04:45:11 +00:00
Qt Submodule Update Bot
3dea9c6b10 Update submodules on '6.4 in qt/qt5'
Change-Id: Icdb9c1b887292b5393b3c5f7f295ecaeadb8806b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-18 23:13:04 +00:00
Volker Hilsheimer
95014705b5 Fix calling of script creating shared folders
The calling script for each platform missed the leading ". " so
powershell never executed the script. Sadly, provisioning still
succeeded.

Add some log output to the script doing the work to verify that
the file system is what is expected to be at the end. If it's not,
then the cd'ing into the shares will fail and the script will
return with a non-zero exit.

Change-Id: I8fe85c7e202132525876cdddf41750732f69aaf9
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit aab85286b7)
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2022-08-18 10:59:12 +02:00
Volker Hilsheimer
97709856d1 Add script to create shared folders for testing Qt I/O with UNC paths
Once these paths exist reliably on the Windows VM running the test, and
are shared, we can access them through UNC paths as

\\${COMPUTERNAME}\testshare

This allows us to remove dependencies to network infrastructure from
those QtCore tests.

The test needs to run last, as otherwise the Visual Studio installer
mysteriously fails to execute. So make some space at the end of the
script list.

Change-Id: Ie11b894f000722a7d99b2c5e279c1b0b63021003
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 72ac097082)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-08-17 19:13:25 +00:00
Heikki Halmet
4d6eb0d26d 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 <qt_ci_bot@qt-project.org>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
(cherry picked from commit 0507008ff6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-08-17 16:01:17 +00:00
Qt Submodule Update Bot
529df4c2d9 Update submodules on '6.4 in qt/qt5'
Change-Id: Iea425e039a01c5f1816ced0a229ff5411babb22f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-17 04:19:12 +00:00
64 changed files with 138 additions and 59 deletions

View File

@@ -51,7 +51,7 @@ Configurations:
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64']
-
Template: 'qtci-windows-11_21H2-x86_64-51'
Template: 'qtci-windows-11_21H2-x86_64-52'
Compiler: 'MSVC2019'
Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure']
Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
@@ -68,7 +68,7 @@ Configurations:
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
]
-
Template: 'qtci-windows-11_21H2-x86_64-51'
Template: 'qtci-windows-11_21H2-x86_64-52'
Compiler: 'MSVC2022'
Features: ['Sccache', "DebugAndRelease", 'UseConfigure']
Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
@@ -103,7 +103,7 @@ Configurations:
]
-
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", 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib'
@@ -111,7 +111,7 @@ Configurations:
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..'
]
-
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', 'UseConfigure']
@@ -173,7 +173,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', 'UseConfigure']
Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg'
@@ -195,7 +195,7 @@ Configurations:
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}'
]
-
Template: 'qtci-windows-11_21H2-x86_64-51'
Template: 'qtci-windows-11_21H2-x86_64-52'
Compiler: 'Mingw'
Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples -qt-zlib -qt-freetype -qt-libjpeg'

View File

@@ -10,7 +10,7 @@ Configurations:
Environment variables: [
'TARGET_CONFIGURE_ARGS=-nomake examples -device integrity-armv8-SA8155P -no-feature-library -no-feature-printdialog -no-dbus -no-feature-gtk3 -no-feature-glib -no-feature-libudev -qt-harfbuzz -qt-pcre -no-sql-mysql',
'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE=/home/qt/integrity_toolchain/toolchain.cmake -DCMAKE_C_COMPILER=cxintarm64 -DCMAKE_CXX_COMPILER=cxintarm64 -DBUILD_qtdoc=OFF -DBUILD_qttranslations=OFF -DUNIX=ON --debug-trycompile',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_system_webp=OFF',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_system_webp=OFF -DQT_FEATURE_timezone=OFF',
'INTEGRITY_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/integrity',
'INTEGRITY_BSP=platform-sa8155', 'INTEGRITY_BUILD_TARGET=rel',
'QC_MULTIMEDIA_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/include/amss/multimedia',

View File

@@ -1,4 +1,9 @@
Version: 2
Include: [
cmake_platforms.yaml: [
Windows10_21H2-MSVC2019-x64-host
]
]
Configurations:
-
Template: 'qtci-windows-10_21H2-x86_64-51'

View File

@@ -41,7 +41,7 @@
# shellcheck source=./SetEnvVar.sh
source "${BASH_SOURCE%/*}/SetEnvVar.sh"
version="3.1.10"
version="3.1.14"
versionNode="v14.18.2"
mkdir -p /opt

View File

@@ -41,7 +41,7 @@
# This script will install emscripten needed by WebAssembly
$version = "3.1.10"
$version = "3.1.14"
# Make sure python is in the path
Prepend-Path "C:\Python27"

View File

@@ -0,0 +1,76 @@
#############################################################################
##
## 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$
##
#############################################################################
# This script creates and shares folders so that we can run I/O tests with
# UNC paths, without depending on an SBM server
$readonly='testshare'
$writable='testsharewritable'
$readonlypath="${env:SystemDrive}\${readonly}"
$writablepath="${env:SystemDrive}\${writable}"
Write-Host "******************** Creating folders ${readonlpath} and ${writablepath}"
if ($(Test-Path -Path $readonlypath)) {
Remove-SmbShare -Name $readonly -Force
Remove-Item -Path $readonlypath -Force -Recurse
}
if ($(Test-Path -Path $writablepath)) {
Remove-SmbShare -Name $writable -Force
Remove-Item -Path $writablepath -Force -Recurse
}
New-Item ${readonlypath} -ItemType Directory
New-Item "${readonlypath}\tmp" -ItemType Directory
New-SmbShare -Name ${readonly} -Path ${readonlypath} -ReadAccess Users
# As expected by tst_networkselftest, exactly 34 bytes
"This is 34 bytes. Do not change..." `
| Out-File -Encoding ascii -FilePath "${readonlypath}\test.pri" -NoNewline
New-Item "${readonlypath}\readme.txt" -ItemType File
New-Item ${writablepath} -ItemType Directory
New-SmbShare -Name ${writable} -Path ${writablepath} -ChangeAccess Users
Write-Host "******************** File system content"
dir ${env:SystemDrive}
cd "\\${env:COMPUTERNAME}\${readonly}"
dir
cd "\\${env:COMPUTERNAME}\${writable}"
dir
Write-Host "******************** Done Content"

View File

@@ -5,7 +5,7 @@ set -ex
sudo curl http://repo-clones.ci.qt.io:8081/tools/rmt-client-setup --output rmt-client-setup
sudo chmod 755 rmt-client-setup
sudo SUSEConnect --cleanup
sudo sh rmt-client-setup https://repo-clones.ci.qt.io:8082 --yes --fingerprint C9:4F:0B:81:DE:84:AF:F2:50:3E:89:B9:7F:BC:63:BB:A7:AC:BE:97
sudo sh rmt-client-setup https://repo-clones.ci.qt.io:8082 --yes --fingerprint 80:90:7F:45:C6:DF:45:8A:57:25:1E:17:5E:D7:E3:6E:96:1B:1B:95
# Activate these modules
sudo SUSEConnect -p sle-module-basesystem/15.3/x86_64

View File

@@ -1,6 +0,0 @@
#!/usr/bin/env bash
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/macos/install-git.sh"

View File

@@ -2,7 +2,7 @@
#############################################################################
##
## Copyright (C) 2021 The Qt Company Ltd.
## 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.
@@ -56,4 +56,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/Xcode_13.2.xip 13.2
InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_13.2.1.xip 13.2.1

View File

@@ -2,7 +2,7 @@
#############################################################################
##
## Copyright (C) 2021 The Qt Company Ltd.
## 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.
@@ -56,4 +56,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/Xcode_13.2.xip 13.2
InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_13.2.1.xip 13.2.1

View File

@@ -0,0 +1 @@
. "$PSScriptRoot\..\common\windows\share-test-folders.ps1"

View File

@@ -0,0 +1 @@
. "$PSScriptRoot\..\common\windows\share-test-folders.ps1"

View File

@@ -0,0 +1 @@
. "$PSScriptRoot\..\common\windows\share-test-folders.ps1"

View File

@@ -0,0 +1 @@
. "$PSScriptRoot\..\common\windows\share-test-folders.ps1"

2
qt3d

Submodule qt3d updated: a970d28893...36d0a5b342

2
qtbase

Submodule qtbase updated: a2334fd510...6dd2dbaef6

2
qtcoap

Submodule qtcoap updated: a49f02c615...94a370fbe1

2
qtdoc

Submodule qtdoc updated: b835a8f4a0...fad57d7430

2
qtmqtt

Submodule qtmqtt updated: 4c40604e09...23f8673518

Submodule qtopcua updated: bf88611758...a61e84b305

2
qtqa

Submodule qtqa updated: 70e2a9e555...3e7d83821e

Submodule qtscxml updated: 5a429abf6e...691942134e

2
qtsvg

Submodule qtsvg updated: f507246f38...fa323f070a

Submodule qttools updated: 4fcb603351...8e316633b6