diff options
63 files changed, 379 insertions, 301 deletions
diff --git a/.gitmodules b/.gitmodules index be85efdc..fb96e110 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,60 +1,60 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.12.10 + branch = 5.12.11 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.12.10 + branch = 5.12.11 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git - branch = 5.12.10 + branch = 5.12.11 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.12.10 + branch = 5.12.11 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.12.10 + branch = 5.12.11 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.12.10 + branch = 5.12.11 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.12.10 + branch = 5.12.11 status = essential [submodule "qtxmlpatterns"] depends = qtbase recommends = qtdeclarative path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.12.10 + branch = 5.12.11 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.12.10 + branch = 5.12.11 status = essential priority = 30 [submodule "qtdoc"] @@ -62,7 +62,7 @@ recommends = qtmultimedia qtquickcontrols qtquickcontrols2 path = qtdoc url = ../qtdoc.git - branch = 5.12.10 + branch = 5.12.11 status = essential priority = 40 [submodule "qtrepotools"] @@ -83,14 +83,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.12.10 + branch = 5.12.11 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.12.10 + branch = 5.12.11 status = addon [submodule "qtsystems"] depends = qtbase @@ -123,185 +123,185 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.12.10 + branch = 5.12.11 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.12.10 + branch = 5.12.11 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.12.10 + branch = 5.12.11 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.12.10 + branch = 5.12.11 status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.12.10 + branch = 5.12.11 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.12.10 + branch = 5.12.11 status = addon [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.12.10 + branch = 5.12.11 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.12.10 + branch = 5.12.11 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.12.10 + branch = 5.12.11 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.12.10 + branch = 5.12.11 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.12.10 + branch = 5.12.11 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.12.10 + branch = 5.12.11 status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.12.10 + branch = 5.12.11 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.12.10 + branch = 5.12.11 status = addon [submodule "qtwebengine"] depends = qtdeclarative recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.12.10 + branch = 5.12.11 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.12.10 + branch = 5.12.11 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.12.10 + branch = 5.12.11 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.12.10 + branch = 5.12.11 status = essential [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git - branch = 5.12.10 + branch = 5.12.11 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.12.10 + branch = 5.12.11 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.12.10 + branch = 5.12.11 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.12.10 + branch = 5.12.11 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.12.10 + branch = 5.12.11 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.12.10 + branch = 5.12.11 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.12.10 + branch = 5.12.11 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.12.10 + branch = 5.12.11 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.12.10 + branch = 5.12.11 status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.12.10 + branch = 5.12.11 status = addon diff --git a/coin/platform_configs/installer-framework.yaml b/coin/platform_configs/installer-framework.yaml index dc3090e3..ad3c42bb 100644 --- a/coin/platform_configs/installer-framework.yaml +++ b/coin/platform_configs/installer-framework.yaml @@ -13,7 +13,7 @@ Configurations: 'qtdeclarative': '-no-feature-d3d12' ] - - Template: 'qtci-macos-10.13-x86_64-2' + Template: 'qtci-macos-10.13-x86_64-3' Compiler: 'Clang' Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -nomake examples -nomake tests -accessibility -static -release -no-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-cups -no-freetype -prefix /Users/qt/work/install' diff --git a/coin/provisioning/common/macos/nodejs.sh b/coin/provisioning/common/macos/nodejs.sh new file mode 100755 index 00000000..b3728999 --- /dev/null +++ b/coin/provisioning/common/macos/nodejs.sh @@ -0,0 +1,50 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2021 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$ +## +############################################################################# + +# shellcheck source=./../unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" + +# This script will install Nodejs + +version="14.16.1" +urlCache="http://ci-files01-hki.ci.local/input/nodejs/node-v$version.pkg" +urlOffcial="https://nodejs.org/dist/v$version/node-v$version.pkg" +sha1="4720274971c40fe51b2c647060f77c45fb4949a7" + +DownloadURL $urlCache $urlOffcial $sha1 "/tmp" +sudo installer -pkg node-v$version.pkg -target / + + echo "Nodejs = $version" >> ~/versions.txt + diff --git a/coin/provisioning/common/macos/python3.sh b/coin/provisioning/common/macos/python3.sh index 35bccc93..185c3b01 100755 --- a/coin/provisioning/common/macos/python3.sh +++ b/coin/provisioning/common/macos/python3.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Copyright (C) 2017 Pelagicore AG ## Contact: http://www.qt.io/licensing/ ## @@ -43,23 +43,23 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" # shellcheck source=./pip.sh source "${BASH_SOURCE%/*}/pip.sh" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-3.6.1-macosx10.6.pkg" -AltUrl="https://www.python.org/ftp/python/3.6.1/python-3.6.1-macosx10.6.pkg" -SHA1="ae0c749544c2d573c3cc29c4c2d7d9a595db28f9" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-3.7.4-macosx10.9.pkg" +AltUrl="https://www.python.org/ftp/python/3.7.4/python-3.7.4-macosx10.9.pkg" +SHA1="ef8a6b1abba6a6e8553916a881af440705653fa8" DestDir="/" InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir" -InstallPip python3.6 +InstallPip python3.7 -/Library/Frameworks/Python.framework/Versions/3.6/bin/pip3 install virtualenv wheel +/Library/Frameworks/Python.framework/Versions/3.7/bin/pip3 install virtualenv wheel -SetEnvVar "PYTHON3_PATH" "/Library/Frameworks/Python.framework/Versions/3.6/bin" -SetEnvVar "PIP3_PATH" "/Library/Frameworks/Python.framework/Versions/3.6/bin" +SetEnvVar "PYTHON3_PATH" "/Library/Frameworks/Python.framework/Versions/3.7/bin" +SetEnvVar "PIP3_PATH" "/Library/Frameworks/Python.framework/Versions/3.7/bin" # Install all needed packages in a special wheel cache directory -/Library/Frameworks/Python.framework/Versions/3.6/bin/pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../shared/requirements.txt +/Library/Frameworks/Python.framework/Versions/3.7/bin/pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../shared/requirements.txt SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" -echo "python3 = 3.6.1" >> ~/versions.txt +echo "python3 = 3.7.4" >> ~/versions.txt diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index b40c1922..0b2368e9 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## 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. @@ -33,141 +33,93 @@ ## ############################################################################# +# shellcheck source=./DownloadURL.sh +source "${BASH_SOURCE%/*}/DownloadURL.sh" + set -ex -# This script will install squish package for Linux and Mac. +# This script will fetch and extract pre-buildt squish package for Linux and Mac. # Squish is need by Release Test Automation (RTA) -version="6.4.3" -# Branch version without dot +version="6.6.1" qtBranch="512x" -squishFolder="/opt/squish" -squishUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/$qtBranch/" -squishFile="squish-$version-qt$qtBranch-linux64.run" +installFolder="/opt" +squishFolder="$installFolder/squish" +preBuildCacheUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/jenkins_build/stable" +licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/$qtBranch/.squish-3-license" +licenseSHA="e000d2f95b30b82f405b9dcbeb233cd43710a41a" if uname -a |grep -q Darwin; then - squishFile="squish-$version-qt$qtBranch-macx86_64.dmg" + compressedFolder="prebuild-squish-$version-$qtBranch-macx86_64.tar.gz" + sha1="18d683c8702ec47528e36f8e352bc64b07e7996a" +else + compressedFolder="prebuild-squish-$version-$qtBranch-linux64.tar.gz" + sha1="9cb84b7c8d920ced056ce94ce75b0879c29fba22" fi -squishLicenseUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/" -squishLicenseFile=".squish-3-license.tar.gz" - -testSuite="suite_test_squish" -testSuiteUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/" +mountFolder="/tmp/squish" +sudo mkdir "$mountFolder" -# These checks can be removed when Vanilla OS for all linux and Mac are in -if [ -d "$squishFolder" ]; then - echo "Move old squish to /tmp" - sudo mv "$squishFolder" "/tmp/squish_$(date)" +# Check which platform +if uname -a |grep -q Darwin; then + usersGroup="staff" + squishLicenseDir="/Users/qt" +elif uname -a |grep -q "el7"; then + usersGroup="qt" + squishLicenseDir="/root" +elif uname -a |grep -q "Ubuntu"; then + usersGroup="users" + squishLicenseDir="/home/qt" +else + usersGroup="users" + squishLicenseDir="/root" fi -if [ -f "/etc/profile.d/squish_env.sh" ]; then - echo "Remove /etc/profile.d/squish_env.sh" - sudo rm -f "/etc/profile.d/squish_env.sh" - export SQUISH_LICENSEKEY_DIR=$HOME +targetFileMount="$mountFolder"/"$compressedFolder" + +echo "Mounting $preBuildCacheUrl to $mountFolder" +sudo mount "$preBuildCacheUrl" "$mountFolder" +echo "Create $installFolder if needed" +if [ ! -d "$installFolder" ]; then + sudo mkdir "$installFolder" fi -function MountAndInstall { - url=$1 - targetDirectory=$2 - targetFile=$3 - - # Check which platform - if uname -a |grep -q Darwin; then - usersGroup="staff" - mountFolder="/Volumes" - squishLicenseDir="/Users/qt" - elif uname -a |grep -q "el7"; then - usersGroup="qt" - mountFolder="/tmp" - squishLicenseDir="/root" - elif uname -a |grep -q "Ubuntu"; then - usersGroup="users" - mountFolder="/tmp" - squishLicenseDir="/home/qt" - else - usersGroup="users" - mountFolder="/tmp" - squishLicenseDir="/root" - fi +VerifyHash "$targetFileMount" "$sha1" - function UnMount { - echo "Unmounting $mountFolder" - sudo diskutil unmount force "$mountFolder" || sudo umount -f "$mountFolder" - } +echo "Uncompress $compressedFolder" +sudo tar -xzf "$targetFileMount" --directory "$installFolder" - targetFileMount="$mountFolder"/"$targetFile" +echo "Unmounting $mountFolder" +sudo diskutil unmount force "$mountFolder" || sudo umount -f "$mountFolder" - echo "Mounting $url to $mountFolder" - sudo mount "$url" "$mountFolder" - echo "Create $targetDirectory if needed" - if [ ! -d "/opt" ]; then - sudo mkdir "/opt" - fi - if [ ! -d "$targetDirectory" ]; then - sudo mkdir "$targetDirectory" - fi - echo "Uncompress $targetFile" - if [[ $targetFile == *.tar.gz ]]; then - if [[ $targetFile == .squish-3-license.* ]]; then - target="$squishLicenseDir" - # Squish license need to be exists also in users home directory, because squish check it before it starts running tests - sudo tar -xzf "$targetFileMount" --directory "$HOME" - else - target="$targetDirectory" - fi - sudo tar -xzf "$targetFileMount" --directory "$target" - UnMount - elif [[ $targetFile == *.dmg ]]; then - echo "'dmg-file', no need to uncompress" - sudo cp $targetFileMount /tmp - UnMount - sudo hdiutil attach "/tmp/$targetFile" - sudo /Volumes/froglogic\ Squish/Install\ Squish.app/Contents/MacOS/Squish unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null 2>&1 - mountFolder="/Volumes/froglogic Squish" - UnMount - elif [[ $targetFile == *.run ]]; then - echo "'run-file', no need to uncompress" - sudo cp $targetFileMount $targetDirectory - UnMount - sudo chmod +x $targetDirectory/$targetFile - sudo $targetDirectory/$targetFile unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null 2>&1 - sudo rm -fr "$targetDirectory/$targetFile" - if uname -a |grep -q "Ubuntu"; then - sudo mkdir /usr/lib/tcl8.6 - sudo cp "$targetDirectory/package/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/ - fi - else - exit 1 +sudo mv "$installFolder/rta_squish_$version" "$squishFolder" + +if uname -a |grep -q "Ubuntu"; then + if [ ! -e "/usr/lib/tcl8.6" ]; then + sudo mkdir /usr/lib/tcl8.6 + sudo cp "$squishFolder/squish_for_qt/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/ fi +fi - echo "Changing ownerships" - sudo chown -R qt:$usersGroup "$targetDirectory" - sudo chown qt:$usersGroup "$HOME/.squish-3-license" -} +DownloadURL "$licenseUrl" "$licenseUrl" "$licenseSHA" "$HOME/.squish-3-license" -echo "Set commands for environment variables in .bashrc" +echo "Changing ownerships" +sudo chown -R qt:$usersGroup "$squishFolder" +sudo chown qt:$usersGroup "$HOME/.squish-3-license" +echo "Set commands for environment variables in .bashrc" if uname -a |grep -q "Ubuntu"; then - echo "export SQUISH_PATH=$squishFolder/package" >> ~/.profile - echo "export PATH=\$PATH:$squishFolder/squish-$version/bin" >> ~/.profile + echo "export SQUISH_PATH=$squishFolder/squish_for_qt" >> ~/.profile + echo "export PATH=\$PATH:$squishFolder/squish_for_qt/bin" >> ~/.profile else - echo "export SQUISH_PATH=$squishFolder/package" >> ~/.bashrc - echo "export PATH=\$PATH:$squishFolder/squish-$version/bin" >> ~/.bashrc + echo "export SQUISH_PATH=$squishFolder/squish_for_qt" >> ~/.bashrc + echo "export PATH=\$PATH:$squishFolder/squish_for_qt/bin" >> ~/.bashrc fi -echo "Installing squish license to home directory.." -MountAndInstall "$squishLicenseUrl" "$squishFolder" "$squishLicenseFile" - -echo "Installing squish $version.." -MountAndInstall "$squishUrl" "$squishFolder" "$squishFile" - -echo "Installing provisioning scripts for squish" -MountAndInstall "$testSuiteUrl" "$squishFolder" "$testSuite.tar.gz" - -echo "Verifying Squish Installation" -if "$squishFolder/package/bin/squishrunner" --testsuite "$squishFolder/$testSuite" | grep "Squish test run successfully" ; then - echo "Squish installation tested successfully" +echo "Verifying Squish" +if "$squishFolder/squish_for_qt/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then + echo "Squish for Qt installation tested successfully" else - echo "Squish test failed! Package wasn't installed correctly." + echo "Squish for Qt test failed! Package wasn't installed correctly." exit 1 fi + diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index 0749d3df..67be55a8 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2020 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -47,28 +47,55 @@ if (Is64BitWinHost) { $version = "1.1.1g" $zip = Get-DownloadLocation ("openssl-$version.tar.gz") +$prebuilt_zip = Get-DownloadLocation ("openssl-android-master-$version.zip") $sha1 = "b213a293f2127ec3e323fb3cfc0c9807664fd997" +$prebuilt_sha1 = "d799f54e402c00eaa2633d54df1e8295bfac3d7b" $destination = "C:\Utils\openssl-android-master" +$prebuilt_url = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-android-master-$version.zip" # msys unix style paths $ndkPath = "/c/Utils/Android/android-ndk-r19c" $openssl_path = "/c/Utils/openssl-android-master" $cc_path = "$ndkPath/toolchains/llvm/prebuilt/windows-x86_64/bin" -Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip -Verify-Checksum $zip $sha1 +if ((Test-Path $prebuilt_url)) { + Download $prebuilt_url $prebuilt_url $prebuilt_zip + Verify-Checksum $prebuilt_zip $prebuilt_sha1 + Extract-7Zip $prebuilt_zip C:\Utils + Remove $prebuilt_zip +} else { + Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip + Verify-Checksum $zip $sha1 + + Extract-7Zip $zip C:\Utils\tmp + Extract-7Zip C:\Utils\tmp\openssl-$version.tar C:\Utils\tmp + Move-Item C:\Utils\tmp\openssl-${version} $destination + Remove "$zip" + + Write-Host "Configuring OpenSSL $version for Android..." + Push-Location $destination + # $ must be escaped in powershell... + + function CheckExitCode { -Extract-7Zip $zip C:\Utils\tmp -Extract-7Zip C:\Utils\tmp\openssl-$version.tar C:\Utils\tmp -Move-Item C:\Utils\tmp\openssl-${version} $destination -Remove-Item -Path $zip + param ( + $p + ) -Write-Host "Configuring OpenSSL $version for Android..." -Push-Location $destination -# $ must be escaped in powershell... -Start-Process -NoNewWindow -Wait -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang $openssl_path/Configure shared android-arm`"") -Start-Process -NoNewWindow -Wait -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang make -f $openssl_path/Makefile build_generated`"") -Pop-Location + if ($p.ExitCode) { + Write-host "Process failed with exit code: $($p.ExitCode)" + exit 1 + } + } + + $configure = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang $openssl_path/Configure shared android-arm`"") + CheckExitCode $configure + + $make = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang make -f $openssl_path/Makefile build_generated`"") + CheckExitCode $make + + Pop-Location + Remove-item C:\Utils\tmp -Recurse -Confirm:$false +} Set-EnvironmentVariable "OPENSSL_ANDROID_HOME" "$destination" -Remove-item C:\Utils\tmp -Recurse -Confirm:$false Write-Output "Android OpenSSL = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/python.ps1 b/coin/provisioning/common/windows/python.ps1 index aee4c199..4ce86d65 100644 --- a/coin/provisioning/common/windows/python.ps1 +++ b/coin/provisioning/common/windows/python.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2016 The Qt Company Ltd. +## 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. @@ -54,8 +54,30 @@ $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\python-$versio Write-Host "Fetching from URL..." Download $externalUrl $internalUrl $package Verify-Checksum $package $sha1 -Write-Host "Installing $package..." -Run-Executable "msiexec" "/passive /i $package TARGETDIR=$targetDir ALLUSERS=1" + +# Python installation is flaky, but seems to pass with second run if error occurs. +$stop = $false +[int]$retry = "0" +do { + try { + # /levx = e:'All error messages' v:'Verbose' x:'Extra debugging info' + Run-Executable "msiexec" "/passive /i $package /levx C:\Windows\Temp\Python_log.log TARGETDIR=$targetDir ALLUSERS=1" + $stop = $true + } + catch { + Get-Content C:\Windows\Temp\Python_log.log -Tail 50 + if ($retry -gt 2) { + Write-Host "Python installation failed!" + throw + } + else { + Write-Host "Couldn't install python, retrying in 30 seconds" + Start-Sleep -s 30 + $retry = $retry + 1 + } + } +} +while ($stop -ne $true) # We need to change allowZip64 from 'False' to 'True' to be able to create ZIP files that use the ZIP64 extensions when the zipfile is larger than 2 GB Write-Host "Changing allowZip64 value to 'True'..." diff --git a/coin/provisioning/common/windows/python3.ps1 b/coin/provisioning/common/windows/python3.ps1 index c05c022c..23829595 100644 --- a/coin/provisioning/common/windows/python3.ps1 +++ b/coin/provisioning/common/windows/python3.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Copyright (C) 2017 Pelagicore AG ## Contact: http://www.qt.io/licensing/ ## @@ -40,7 +40,7 @@ param( ) . "$PSScriptRoot\helpers.ps1" -$version = "3.6.1" +$version = "3.6.2" $package = "C:\Windows\temp\python-$version.exe" # check bit version @@ -48,11 +48,11 @@ if ( $archVer -eq 64 ) { Write-Host "Installing 64 bit Python" $externalUrl = "https://www.python.org/ftp/python/$version/python-$version-amd64.exe" $internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/python-$version-amd64.exe" - $sha1 = "bf54252c4065b20f4a111cc39cf5215fb1edccff" + $sha1 = "bcf9bda733a9153811209c62d628c41ab6cedbe2" } else { $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.exe" $internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/python-$version.exe" - $sha1 = "76c50b747237a0974126dd8b32ea036dd77b2ad1" + $sha1 = "cd9744b142eca832f9534390676e6cfb84bf655d" } Write-Host "Fetching from URL..." diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index de04d242..2b676379 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2018 The Qt Company Ltd. +## 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. @@ -33,122 +33,48 @@ . "$PSScriptRoot\helpers.ps1" -# This script will install squish package for Windows. +# This script will pre-installed squish package for Windows. # Squish is need by Release Test Automation (RTA) -# NOTE! Make sure 64bit versions are always installed before 32bit, -# because they use same folder name before a rename -$version = "6.4.3" - -# Qt branch without dot (*.*) +$version = "6.6.1" $qtBranch = "512x" -# So far Squish built with Qt5.12 works also with 5.13, but we have to be prepared that on some point -# the compatibility breaks, and we may need to have separate Squish packages for different Qt versions. - $targetDir = "C:\Utils\squish" -$squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin" -$squishBranchUrl = "$squishUrl\$qtBranch" -$testSuite = "suite_test_squish" -$testSuiteUrl = "$squishUrl\$testSuite.7z" +$squishPackage = "C:\Utils\rta_squish" +$squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable" +$licenseUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin" # Squish license $licensePackage = ".squish-3-license" -$OSVersion = (get-itemproperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion" -Name ProductName).ProductName - -Function DownloadAndInstallSquish { - Param ( - [string]$version, - [string]$bit, - [string]$squishPackage - ) - # MinGW x86 available only with Qt5.11, to be updated when Squish is supporting 5.13 - if ("$bit" -eq "win32" -and $squishPackage.StartsWith("mingw")) { - $qtBranch = "511x" - } - $SquishUrl = $squishBranchUrl + "\squish-" + $version + "-qt" + $qtBranch + "-" + $bit + "-" + $squishPackage + ".exe" - $SquishInstaller = "$targetDir\$squishPackage.exe" - $SquishParameters = "unattended=1 targetdir=$targetDir\$squishPackage" +Write-Host "Installing Squish license to home directory" +Copy-Item $licenseUrl\$licensePackage ~\$licensePackage - Write-Host "Fetching from URL $squishUrl" - Copy-Item "$SquishUrl" "$SquishInstaller" - Write-Host "Installing Squish" - Run-Executable "$SquishInstaller" "$SquishParameters" - Remove-Item -Path $SquishInstaller - if ("$bit" -eq "win64") { - if ($squishPackage.StartsWith("mingw")) { - $squishPackage64bit = "mingw_64" - } else { - $squishPackage64bit = "$squishPackage`_64" - } - Rename-Item $targetDir\$squishPackage $targetDir\$squishPackage64bit - TestSquish $squishPackage64bit - } else { - if ($squishPackage.StartsWith("mingw")) { - Rename-Item $targetDir\$squishPackage $targetDir\mingw - TestSquish mingw - } else { - TestSquish $squishPackage - } - } -} - -Function DownloadSquishLicence { - Param ( - [string]$squishUrl - ) - - Write-Host "Installing Squish license to home directory" - Copy-Item $squishUrl\$licensePackage ~\$licensePackage -} - -Function TestSquish { - Param ( - [string]$squishPackage - ) - - Write-Host "Verifying Squish Installation" - if (cmd /c "$targetDir\$squishPackage\bin\squishrunner.exe --testsuite $targetDir\$testSuite" |Select-String -Pattern "Squish test run successfully") { - Write-Host "Squish installation tested successfully!" - } else { - Write-Host "Squish test failed! $squishPackage wasn't installed correctly." - [Environment]::Exit(1) - } +if (Is64BitWinHost) { + $arch = "x64" +} else { + $arch = "x86" } -Write-Host "Creating $targetDir" -New-Item -ErrorAction Ignore -ItemType directory -Path "$targetDir" - -Write-Host "Download and install Test Suite for squish" -Copy-Item $testSuiteUrl $targetDir/$testSuite.7z -Extract-7Zip $targetDir/$testSuite.7z $targetDir - -DownloadSquishLicence $squishUrl +$OSVersion = (get-itemproperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion" -Name ProductName).ProductName if ($OSVersion -eq "Windows 10 Enterprise") { - + $winVersion = "win10" if (Is64BitWinHost) { - DownloadAndInstallSquish $version win64 "msvc14" - DownloadAndInstallSquish $version win64 "msvc141" - DownloadAndInstallSquish $version win64 "mingw_gcc73_posix_seh" + $sha1 = "13cb5b6a71d915213fac4273c99c83406b03985f" } else { - DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf" - } - DownloadAndInstallSquish $version win32 "msvc141" - -} elseif ($OSVersion -eq "Windows 8.1 Enterprise") { - - if (Is64BitWinHost) { - DownloadAndInstallSquish $version win64 "msvc14" + $sha1 = "33484220762110b2fce1a1f9042f27358cb23929" } - DownloadAndInstallSquish $version win32 "msvc141" - } elseif ($OSVersion -eq "Windows 7 Enterprise") { - - if (Is64BitWinHost) { - DownloadAndInstallSquish $version win64 "msvc14" - } else { - DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf" - } - DownloadAndInstallSquish $version win32 "msvc141" + $winVersion = "win7" + $sha1 = "05d6255b090eace35cf1e899ea203e9182cccccd" } +$squishArchive = "prebuild-squish-$version-$qtBranch-$winVersion-$arch.zip" + +Copy-Item "$squishUrl\$squishArchive" "C:\Utils" +Verify-Checksum "C:\Utils\$squishArchive" $sha1 +Extract-7Zip "C:\Utils\$squishArchive" "C:\Utils" +Rename-Item "$squishPackage" "$targetDir" + +Write-Host "Verifying Squish Installation for following targets:" +get-childitem "$targetDir" -Filter squishrunner.exe -Recurse | % { $_.FullName } +get-childitem "$targetDir" -Filter squishrunner.exe -Recurse | % { if (cmd /c $_.FullName --testsuite "$targetDir\suite_test_squish" |Select-String -Pattern "Squish test run successfully") { Write-Host "Squish tested successfully"} else { [Environment]::Exit(1) } } diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/04-install-packages.sh index c1189a94..ff5c5706 100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/04-install-packages.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2018 The Qt Company Ltd. +## 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. @@ -44,3 +44,5 @@ installPackages+=(openssl-devel) sudo yum -y install "${installPackages[@]}" +gccVersion="$(gcc --version |grep gcc |cut -b 11-16)" +echo "GCC = $gccVersion" >> versions.txt diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh index cbe4e512..58f8149b 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh @@ -129,6 +129,9 @@ sudo ln -s /opt/rh/rh-python36/root/usr/bin/pip3 /usr/local/bin/pip3 sudo pip install --upgrade "pip < 21.0" sudo pip install virtualenv wheel +# Needed by packaging scripts +sudo /usr/local/bin/pip3 install colorlog --user + sudo /usr/local/bin/pip3 install wheel # Install all needed packages in a special wheel cache directory /usr/local/bin/pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" @@ -136,3 +139,7 @@ sudo /usr/local/bin/pip3 install wheel # shellcheck source=../common/unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" + +gccVersion="$(gcc --version |grep gcc |cut -b 11-16)" +echo "GCC = $gccVersion" >> versions.txt + diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/02-enable-modules.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/02-enable-modules.sh new file mode 100755 index 00000000..2d6c2044 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-12-x86_64/02-enable-modules.sh @@ -0,0 +1,50 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2021 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$ +## +############################################################################# + +set -e + +curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.intra.qt.io/input/semisecure/suse_rk.sh -o "/tmp/suse_rk.sh" &>/dev/null +sudo chmod 755 /tmp/suse_rk.sh +/tmp/suse_rk.sh + +# Activate these modules +# sudo SUSEConnect -p PackageHub/12.4/x86_64 +sudo SUSEConnect -p sle-module-toolchain/12/x86_64 +sudo SUSEConnect -p sle-sdk/12.4/x86_64 +sudo SUSEConnect -p sle-module-legacy/12/x86_64 +# This is needed by Nodejs and QtWebEngine +sudo SUSEConnect -p sle-module-web-scripting/12/x86_64 + +sudo rm -f /tmp/suse_rk.sh diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/02-zypperpackages.sh index cdea163f..8f1c4a7b 100755 --- a/coin/provisioning/qtci-linux-SLES-12-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-SLES-12-x86_64/02-zypperpackages.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2019 The Qt Company Ltd. +## 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. @@ -94,3 +94,5 @@ sudo zypper -nq install libfreetds freetds-devel # sqlite2 support sudo zypper -nq install sqlite2 sqlite2-devel +gccVersion="$(gcc --version |grep gcc |cut -b 17-23)" +echo "GCC = $gccVersion" >> versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-signing-tools.ps1 b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-enable-modules.sh index 2ad25685..0de056b6 100644..100755 --- a/coin/provisioning/qtci-windows-10-x86_64/90-signing-tools.ps1 +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-enable-modules.sh @@ -1,7 +1,8 @@ +#!/usr/bin/env bash + ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. -## Copyright (C) 2017 Pelagicore AG +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -32,13 +33,16 @@ ## ############################################################################# -. "$PSScriptRoot\..\common\windows\helpers.ps1" +set -e -# Signing tools are needed to sign offline installers when releasing +curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.intra.qt.io/input/semisecure/suse_rk.sh -o "/tmp/suse_rk.sh" &>/dev/null +sudo chmod 755 /tmp/suse_rk.sh +/tmp/suse_rk.sh -$url = "http://ci-files01-hki.intra.qt.io/input/semisecure/sign/sign.zip" -$destination = "C:\Windows\temp\sign.zip" +# Activate these modules +sudo SUSEConnect -p sle-module-desktop-applications/15/x86_64 +sudo SUSEConnect -p sle-module-development-tools/15/x86_64 +# This is needed by Nodejs and QtWebEngine +sudo SUSEConnect -p sle-module-web-scripting/15/x86_64 -Download $url $url $destination -Extract-7Zip "$destination" "C:\Utils" -Remove-Item -Path "$destination" +sudo rm -f /tmp/suse_rk.sh diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh index 12f3a673..1f495c3e 100755 --- a/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2019 The Qt Company Ltd. +## 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. @@ -95,3 +95,12 @@ sudo zypper -nq install unixODBC-devel unixODBC # sqlite support sudo zypper -nq install sqlite3 sqlite3-devel +# Java - needed by RTA jenkins +sudo zypper -nq install java + +# open-vm-tools requires update. Version in tier1 is broken and causes segfault on boot. +sudo zypper -nq update open-vm-tools + +gccVersion="$(gcc --version |grep gcc |cut -b 17-23)" +echo "GCC = $gccVersion" >> versions.txt + diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/02-apt.sh index 909e4288..59b70280 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/02-apt.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## 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. @@ -56,3 +56,5 @@ sudo apt-get update echo "Installing packages" sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}" +gccVersion="$(gcc --version |grep gcc |cut -b 13-17)" +echo "GCC = $gccVersion" >> versions.txt diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh index 226b1ebf..c0773280 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## 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. @@ -186,3 +186,6 @@ pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/sh # shellcheck source=../common/unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" + +gccVersion="$(gcc --version |grep gcc |cut -b 13-17)" +echo "GCC = $gccVersion" >> versions.txt diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh index 2fab85ac..4bde18dd 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh @@ -67,3 +67,6 @@ sudo zypper -nq install libpulse-devel # cups sudo zypper -nq install cups-devel + +gccVersion="$(gcc --version |grep gcc |cut -b 17-23)" +echo "GCC = $gccVersion" >> versions.txt diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-macos-10.13-x86_64/05-systemsetup.sh index 95631107..8e8838ce 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/05-systemsetup.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/05-systemsetup.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2019 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -97,4 +97,16 @@ echo "Set Network Test Server address to $NTS_IP in /etc/hosts" echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts sudo systemsetup settimezone GMT +# Setting Time Zone seems to be flaky in macOS 10.13. Checking that Time Zone is correct. If not, reset it. +if [[ $(sudo systemsetup -gettimezone) = *GMT* ]]; then + echo "Time Zone is GMT" +else + echo "Wrong Time Zone. Reset Time Zone to GMT" + sleep 5 + sudo systemsetup settimezone GMT + if [[ $(sudo systemsetup -gettimezone) != *GMT* ]]; then + echo "Couldn't set Time Zone!" + exit 1 + fi +fi sudo rm -f "$targetFile" diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/30-nodejs.sh b/coin/provisioning/qtci-macos-10.14-x86_64/30-nodejs.sh new file mode 100755 index 00000000..3b88d526 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/30-nodejs.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/nodejs.sh" diff --git a/coin/provisioning/qtci-windows-10-x86/01-enable-guest-logon.ps1 b/coin/provisioning/qtci-windows-10-x86/01-enable-guest-logon.ps1 new file mode 100644 index 00000000..3cf989d3 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/01-enable-guest-logon.ps1 @@ -0,0 +1,2 @@ +# Allow SMB client guest logons to SMB server. +reg.exe ADD "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanWorkstation\Parameters" /V AllowInsecureGuestAuth /T REG_dWORD /D 1 /F diff --git a/qt3d b/qt3d -Subproject c9d86b593e62c880d567a0672bd86283d8242f1 +Subproject 6704dfddcb6630809abc55b420dd125aa292922 diff --git a/qtactiveqt b/qtactiveqt -Subproject d09457fadc277388667f2f3755b2abd418743e6 +Subproject c81918a0b2dddf10c424d99bae7de4d5ab58e21 diff --git a/qtandroidextras b/qtandroidextras -Subproject b6a10faf9657b774acffee882a22a2f9c1fa355 +Subproject 4a5732791112b53a038175ea284e7e28a59dcf2 diff --git a/qtbase b/qtbase -Subproject c919fc5f65c1c509370df7e616263ed007931a7 +Subproject 4341f6763b8a737ebc07bb78ead22bc05a1a515 diff --git a/qtcanvas3d b/qtcanvas3d -Subproject b977d8c14cda8159dfd669e0bd42b263e936a12 +Subproject 3c642062e896f3c6f300108ece203f89f68e578 diff --git a/qtcharts b/qtcharts -Subproject 754f8d15a01bae966c43749e3cc833d2def7e80 +Subproject d8d2057cbfcf190908a9780085726200bcfe559 diff --git a/qtconnectivity b/qtconnectivity -Subproject 568c411f2751a97e9cc39f58adfa16f2465c4ba +Subproject 8618e25e01ca9c6c6b2221041f625ac69f6757b diff --git a/qtdatavis3d b/qtdatavis3d -Subproject dae7527bee9f86bc0e6254068aeeb908df5a6de +Subproject e2c93beb40914118861a329889c08ca04fb5457 diff --git a/qtdeclarative b/qtdeclarative -Subproject 36e4e9bbd402cefab9d7b68635a94a02e0b4118 +Subproject ca5d6cccde1f977eedb46f3320fe8384ea41758 diff --git a/qtdoc b/qtdoc -Subproject e10560e0e3ac3248489acf81a3da9e4264d8e39 +Subproject f3afd5180f532494ab188e279f4a80196902e8c diff --git a/qtgamepad b/qtgamepad -Subproject 93b710ebc59a5fac6f9f657c5afe8770bf7506a +Subproject dd95a7e0c6a8f00cc6f97f3db17eb7abcadef91 diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject fabaae2f8039d9f12e8531e2dc215b24ffe8d44 +Subproject b2634e344d73154aea459031cf8fa298e668c4f diff --git a/qtimageformats b/qtimageformats -Subproject 7518d381be0f58f943bd8bead901356d2528e26 +Subproject 25341cf53dfa36c83b74c125c260c72d2477ba5 diff --git a/qtlocation b/qtlocation -Subproject 3c7489c3802a11bf62b7f851fb088f9671b7626 +Subproject 1467a23cb25779d304e5bcdd6feb1b059c6609e diff --git a/qtmacextras b/qtmacextras -Subproject 1fc8c238f362ee44799faf38ad42ebd269b3d4b +Subproject 904ef25fe88995edb80b0094d8d507a34bd735b diff --git a/qtmultimedia b/qtmultimedia -Subproject 67ab370d6a87d3b44e1cc4efb0f3fc57d5ac751 +Subproject a83b9873c0d2fe6001e3653e7ec8126c368dfd3 diff --git a/qtnetworkauth b/qtnetworkauth -Subproject 2bcf17c3e4131b0b5b15c96ed104fceede3c399 +Subproject c8ee9188de609b4432e70a8b1edbc52d756c348 diff --git a/qtpurchasing b/qtpurchasing -Subproject f3cbd4531566f6c0d0b14ba179b8396bf427008 +Subproject e6f9faf8b2e3b8973875913859962946874ce36 diff --git a/qtqa b/qtqa -Subproject bc1b16f51bf95a96dbc5f1ee0b75acd5a7e7fe9 +Subproject 9936745276cfae83077bb1d77d52b4a4b38ede8 diff --git a/qtquickcontrols b/qtquickcontrols -Subproject 8c37f9ee025057ab27f9a8c92e8d3e2b585ebf6 +Subproject 8b9258bea9928718827f19e3f2de43ad2e06f86 diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject 63f73a2aee40f9bec5ef63fdd416877a6737110 +Subproject 249469f9ee1ca682e2d2b69da57e4408f635429 diff --git a/qtremoteobjects b/qtremoteobjects -Subproject bfd4ed0f9a6edf9217dcea99e2f045f53245378 +Subproject 287260928b5ca3b8bc4137daeaf9cfd78763a08 diff --git a/qtrepotools b/qtrepotools -Subproject ee34618d9f94e0cb6f678140e6cd2916308531b +Subproject a9592e2bdefd97be8544f9319fe85b56258d0d9 diff --git a/qtscript b/qtscript -Subproject 2ec32b5fdb9671f44e506964ae03109e557dfb9 +Subproject 1864a837cb69bd827222a8a7ab738b576f0fe1f diff --git a/qtscxml b/qtscxml -Subproject 878112bf670bb9f9caa09de290c63b0f9078d3f +Subproject 585b47f5a171a0c1052fae5b7a575d27893caaf diff --git a/qtsensors b/qtsensors -Subproject 903ed99bcc92417cd76d79ac598daf5f299b80c +Subproject a24dc8e867bbf97078babec7b752ccaf6638cea diff --git a/qtserialbus b/qtserialbus -Subproject dbddf24b08141ffd2f1ed98fbcf64b1220161e0 +Subproject 0a751b7ca63b96a2642dea4f2d012099a2f1aeb diff --git a/qtserialport b/qtserialport -Subproject 9431549e2e3c75dafa38a6bd7d45cbaa091a632 +Subproject 9f839731d9a2dfa7ca022afabda8a2071f55e17 diff --git a/qtspeech b/qtspeech -Subproject e5f94476d1f255816c1d1e4d2f45a303541ff64 +Subproject 074286060690994c9bcf0e94ff859ceea63045f diff --git a/qtsvg b/qtsvg -Subproject 261ed79b966065f4ce398f1a701be6298dd49be +Subproject 9311a42677db244cd1c584f27270fa73f69d90d diff --git a/qttools b/qttools -Subproject 1d665e7f4ac2a426e702c2935f11aa160e27bdd +Subproject cceb7710cf287ea88b72260093de985987d83f5 diff --git a/qttranslations b/qttranslations -Subproject e281294aeb5e74e93fb2f71233b133a4177593d +Subproject 161225fb99099f67ac4a2b41eb051c062e34a91 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard -Subproject bb9fd3b992d716ebba392bc3cf21da41e5562d0 +Subproject ed820383941b68f1fe244895e73ee61ba87c437 diff --git a/qtwayland b/qtwayland -Subproject 971ed94adbf538af5a09e4136921fc0e8cee981 +Subproject 8fe61d79d6d629958da7e590174a0e0600652be diff --git a/qtwebchannel b/qtwebchannel -Subproject 7219a32c30d21bc6cc8fe2121e28d19da3d67b0 +Subproject ee94974592b1423b0438f809390a9237cdc8f1e diff --git a/qtwebengine b/qtwebengine -Subproject 07fcac049e7b362b703f31ec559f5097f804588 +Subproject 9dfb4348feb612ea6405428c3c64f48328083e9 diff --git a/qtwebglplugin b/qtwebglplugin -Subproject 954a898bea7af04cb619c05637a651e3a0d925f +Subproject b3089f235788650eac329c552393a36b3f65f06 diff --git a/qtwebsockets b/qtwebsockets -Subproject 4156135c236ae2799f40fae1741c038d1f15093 +Subproject 56c4699b432ad2ea9e1de9922ee97ac7c637f2f diff --git a/qtwebview b/qtwebview -Subproject 14a616da97106ce08fae58329c211c4688c7fbd +Subproject fa3d166d96c958d62c5f02c1f6475ce1fb3f08b diff --git a/qtwinextras b/qtwinextras -Subproject 9ec782f24f2a852d351619e174e1bec79112ff4 +Subproject 301962d5d36a526155c4e5d0c5c3a4c0fbef428 diff --git a/qtx11extras b/qtx11extras -Subproject be7f01d16d143681be394a13e19eb4d816aa8a9 +Subproject 2f7e2243c613677efe386d8e1ca0699a4050b0d diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject 2e532e96db74bc666af800c2530827eea75a210 +Subproject bac4d2eb31cc7d2df246fe069376dad0ed531dc |