From 54cdba9e3dbedcb5567628a29f938fddacba828a Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 18 Jan 2019 12:34:45 +0200 Subject: Provisioning: Remove Unneeded Android variables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I7dd008aef6465fdddd07e227b48e9b6361c13f81 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/windows/android-openssl.ps1 | 4 ---- 1 file changed, 4 deletions(-) (limited to 'coin/provisioning') diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index 4fe5e5ee..cf144c90 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -53,10 +53,6 @@ Rename-Item C:\Utils\openssl-$version $destination Remove-Item -Path $zip Remove-Item C:\Utils\openssl-$version.tar -Set-EnvironmentVariable "CC" "C:\utils\Android\android-ndk-r18b\toolchains\llvm\prebuilt\windows\bin\clang" -Set-EnvironmentVariable "ANDROID_AR" "C:\utils\Android\android-ndk-r18b\toolchains\llvm\prebuilt\windows\bin\llvm-ar" -Set-EnvironmentVariable "ANDROID_DEV" "C:\utils\Android\android-ndk-r18b\platforms\android-21\arch-arm\usr" - # Make sure configure for openssl has a "make" and "perl" available $env:PATH = $env:PATH + ";C:\msys\1.0\bin;C:\strawberry\perl\bin" -- cgit v1.2.3 From 8ba5474da792b2aaa54fcbae46abc440857332ba Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 7 Nov 2018 11:39:44 +0200 Subject: Provisioning: Install Google's Protocol Buffers Protobuf is needed for Automotive Suite Task-number: QTQAINFRA-2314 Change-Id: I12b4248f1de5aea88f573297a47b791b5b6296fb Reviewed-by: Samuli Piippo --- coin/provisioning/common/unix/install_protobuff.sh | 75 ++++++++++++++++++++++ .../common/windows/install-protobuf.ps1 | 64 ++++++++++++++++++ .../60-install_protobuff.sh | 40 ++++++++++++ .../35-install_protobuff.sh | 40 ++++++++++++ .../qtci-windows-10-x86_64/92-install-protobuf.ps1 | 2 + 5 files changed, 221 insertions(+) create mode 100755 coin/provisioning/common/unix/install_protobuff.sh create mode 100644 coin/provisioning/common/windows/install-protobuf.ps1 create mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/60-install_protobuff.sh create mode 100755 coin/provisioning/qtci-macos-10.13-x86_64/35-install_protobuff.sh create mode 100644 coin/provisioning/qtci-windows-10-x86_64/92-install-protobuf.ps1 (limited to 'coin/provisioning') diff --git a/coin/provisioning/common/unix/install_protobuff.sh b/coin/provisioning/common/unix/install_protobuff.sh new file mode 100755 index 00000000..59e9b699 --- /dev/null +++ b/coin/provisioning/common/unix/install_protobuff.sh @@ -0,0 +1,75 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2018 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=./DownloadURL.sh +source "${BASH_SOURCE%/*}/DownloadURL.sh" +# shellcheck source=./SetEnvVar.sh +source "${BASH_SOURCE%/*}/SetEnvVar.sh" + +# This script will install Google's Protocal Buffers which is needed by Automotive Suite + +version="3.6.1" +sha1="44b8ba225f3b4dc45fb56d5881ec6a91329802b6" +internalUrl="http://ci-files01-hki.intra.qt.io/input/automotive_suite/protobuf-all-$version.zip" +externalUrl="https://github.com/protocolbuffers/protobuf/releases/download/v$version/protobuf-all-$version.zip" + +targetDir="$HOME/protobuf-$version" +targetFile="$targetDir.zip" +DownloadURL "$internalUrl" "$externalUrl" "$sha1" "$targetFile" +unzip "$targetFile" -d "$HOME" +sudo rm "$targetFile" + +# devtoolset is needed when running configuration +if uname -a |grep -qv "Darwin"; then + export PATH="/opt/rh/devtoolset-4/root/usr/bin:$PATH" +fi + +echo "Configuring and building protobuf" +cd "$targetDir" +if uname -a |grep -q Darwin; then + ./configure --prefix "$(xcrun --sdk macosx --show-sdk-path)/usr/local" + SetEnvVar PATH "\$PATH:$(xcrun --sdk macosx --show-sdk-path)/usr/local/bin" +else + ./configure +fi +make +sudo make install + +# Refresh shared library cache if OS isn't macOS +if uname -a |grep -qv "Darwin"; then + sudo ldconfig +fi + +sudo rm -r "$targetDir" diff --git a/coin/provisioning/common/windows/install-protobuf.ps1 b/coin/provisioning/common/windows/install-protobuf.ps1 new file mode 100644 index 00000000..fd3fb3d3 --- /dev/null +++ b/coin/provisioning/common/windows/install-protobuf.ps1 @@ -0,0 +1,64 @@ +############################################################################# +## +## Copyright (C) 2019 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$ +## +############################################################################# +. "$PSScriptRoot\helpers.ps1" + +# This script will install Google's Protocol Buffers +# Script requires Cmake to be installed and strawberry-perl not to be installed + +$version = "3.6.1" +$sha1 = "44b8ba225f3b4dc45fb56d5881ec6a91329802b6" +$officialUrl = "https://github.com/protocolbuffers/protobuf/releases/download/v$version/protobuf-all-$version.zip" +$cachedUrl = "http://ci-files01-hki.ci.local/input/automotive_suite/protobuf-all-$version.zip" +$zip = "C:\Utils\protobuf-all-$version.zip" +$installationFolder = "C:\Utils\protobuf" + +Write-Host "Installing Protocol Buffers" +Add-Path "C:\CMake\bin" +Download "$officialUrl" "$cachedUrl" "$zip" +Verify-Checksum "$zip" "$sha1" +Extract-7Zip "$zip" C:\Utils +New-Item -ItemType directory -Force -Path "C:\Utils\protobuf-$version\cmake\build" +New-Item -ItemType directory -Force -Path "C:\Utils\protobuf-$version\cmake\build\release" +New-Item -ItemType directory -Force -Path "$installationFolder" +cd "C:\Utils\protobuf-$version\cmake\build\release" +cmd /c "`"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Professional\\VC\\Auxiliary\\Build\\vcvars64.bat`" && cmake -G `"NMake Makefiles`" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$installationFolder ../.. && nmake && nmake install" +if(![System.IO.File]::Exists("$installationFolder\bin\protoc.exe")){ + Write-Host "Can't find $installationFolder\bin\protoc.exe. Installation probably failed!" + exit 1 +} + +Remove-Item "$zip" + +Add-Path "$installationFolder\bin" +Set-EnvironmentVariable PROTOBUF_INCLUDE "$installationFolder\include" +Set-EnvironmentVariable PROTOBUF_LIB "$installationFolder\lib" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/60-install_protobuff.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/60-install_protobuff.sh new file mode 100755 index 00000000..a77938b3 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/60-install_protobuff.sh @@ -0,0 +1,40 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2018 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 -ex + +# shellcheck source=../common/unix/install_protobuff.sh +source "${BASH_SOURCE%/*}/../common/unix/install_protobuff.sh" + diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/35-install_protobuff.sh b/coin/provisioning/qtci-macos-10.13-x86_64/35-install_protobuff.sh new file mode 100755 index 00000000..a77938b3 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/35-install_protobuff.sh @@ -0,0 +1,40 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2018 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 -ex + +# shellcheck source=../common/unix/install_protobuff.sh +source "${BASH_SOURCE%/*}/../common/unix/install_protobuff.sh" + diff --git a/coin/provisioning/qtci-windows-10-x86_64/92-install-protobuf.ps1 b/coin/provisioning/qtci-windows-10-x86_64/92-install-protobuf.ps1 new file mode 100644 index 00000000..8bcdf3fa --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/92-install-protobuf.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\install-protobuf.ps1" + -- cgit v1.2.3 From 3cb745565fefdfdc4e5145290ae34fb00328ebb8 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 30 Jan 2019 12:09:34 +0200 Subject: Provisioning: Renew iOS signing certificates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-2690 Change-Id: I4a058c7d88b3daa24f62d5bc314ec2b0ecc8c383 Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'coin/provisioning') diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh b/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh index b70a8a78..d9caff91 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh @@ -114,14 +114,14 @@ sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" { Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios; } 2> /dev/null { iosPassword=$(<"$targetFolder/ios_password.txt"); } 2> /dev/null -iPhoneDeveloper="iosdevelopment.p12" -shaIPhoneDeveloper="f48f6827e8d0ccdc764cb987e401b9a6f7d3f10c" +iPhoneDeveloper="iosdevelopment_2019.p12" +shaIPhoneDeveloper="fbc89661c5295b4105f3890989a94c559ea4a61c" Install "$cacheSigningTools/latest_ios_cert/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper echo "Importing $iPhoneDeveloper.." { security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign; } 2> /dev/null -iPhoneDistribution="iosdistribution.p12" -shaIPhoneDistribution="64b1174fc3ce0eca044fbc9fa144f6a2d4330171" +iPhoneDistribution="iosdistribution_2019.p12" +shaIPhoneDistribution="f306102f9e18e2074a7b655a9b151ce69c95baac" Install "$cacheSigningTools/latest_ios_cert/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution echo "Importing $iPhoneDistribution.." { security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign; } 2> /dev/null -- cgit v1.2.3 From 9b84c7135b9903d6f975ea082d7ae5958248a8fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Wed, 16 Jan 2019 15:31:55 +0200 Subject: Build MIPS64 with b2qt toolchain MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This configuration verifies big endian builds Task-number: QTQAINFRA-2492 Reviewed-by: Qt CI Bot Reviewed-by: Samuli Piippo (cherry picked from commit 80339a10a4af1dbb282688fe03d4e52aac641c1d) Change-Id: I3111190b5c924eb73b037b94be1a0dc48bcc68c2 Reviewed-by: Tony Sarajärvi --- .../qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh | 29 +++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) (limited to 'coin/provisioning') diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh index fbe669d9..604ac551 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh @@ -40,7 +40,7 @@ set -ex source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" -echo "Installing Yocto toolchain for 32-bit b2qt..." +echo "Installing Yocto toolchain for 32-bit b2qt ARMV7..." versionARM="2.3.4" package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarmv7-7608ebe.sh" @@ -58,7 +58,7 @@ chmod +x "$yoctoInstaller" /bin/bash "$yoctoInstaller" -y -d "$yoctoLocationARMv7" rm -rf "$yoctoInstaller" -echo "Installing Yocto toolchain for 64-bit b2qt..." +echo "Installing Yocto toolchain for 64-bit b2qt ARM64..." versionARM64="2.3.4" package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarm64-7608ebe.sh" @@ -76,11 +76,33 @@ chmod +x "$yoctoInstaller" /bin/bash "$yoctoInstaller" -y -d "$yoctoLocationARM64" rm -rf "$yoctoInstaller" -if [ -e "$yoctoLocationARMv7/$sysrootARMv7" -a -e "$yoctoLocationARMv7/${crosscompileARMv7}g++" -a -e "$yoctoLocationARM64/$sysrootARM64" -a -e "$yoctoLocationARM64/${crosscompileARM64}g++" ]; then +echo "Installing Yocto toolchain for 64-bit b2qt MIPS64..." + +versionMIPS64="2.5.2" +package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemumips64-409ebc3.sh" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/sumo/$package" +AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/sumo/$package" +SHA1="dd03b496707ca8888b339a667e021722a8c2fdb4" +yoctoInstaller="/tmp/yocto-toolchain-mips64.sh" +yoctoLocationMIPS64="/opt/yocto-mips64" +sysrootMIPS64="sysroots/mips64-poky-linux" +crosscompileMIPS64="sysroots/x86_64-pokysdk-linux/usr/bin/mips64-poky-linux/mips64-poky-linux-" + +DownloadURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$yoctoInstaller" +chmod +x "$yoctoInstaller" + +/bin/bash "$yoctoInstaller" -y -d "$yoctoLocationMIPS64" +rm -rf "$yoctoInstaller" + + + +if [ -e "$yoctoLocationARMv7/$sysrootARMv7" -a -e "$yoctoLocationARMv7/${crosscompileARMv7}g++" -a -e "$yoctoLocationARM64/$sysrootARM64" -a -e "$yoctoLocationARM64/${crosscompileARM64}g++" -a -e "$yoctoLocationMIPS64/$sysrootMIPS64" -a -e "$yoctoLocationMIPS64/${crosscompileMIPS64}g++" ]; then SetEnvVar "QEMUARMV7_TOOLCHAIN_SYSROOT" "$yoctoLocationARMv7/$sysrootARMv7" SetEnvVar "QEMUARMV7_TOOLCHAIN_CROSS_COMPILE" "$yoctoLocationARMv7/$crosscompileARMv7" SetEnvVar "QEMUARM64_TOOLCHAIN_SYSROOT" "$yoctoLocationARM64/$sysrootARM64" SetEnvVar "QEMUARM64_TOOLCHAIN_CROSS_COMPILE" "$yoctoLocationARM64/$crosscompileARM64" + SetEnvVar "QEMUMIPS64_TOOLCHAIN_SYSROOT" "$yoctoLocationMIPS64/$sysrootMIPS64" + SetEnvVar "QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE" "$yoctoLocationMIPS64/$crosscompileMIPS64" else echo "Error! Couldn't find installation paths for Yocto toolchain. Aborting provisioning." 1>&2 exit 1 @@ -88,3 +110,4 @@ fi echo "Yocto ARMv7 toolchain = $versionARM" >> ~/versions.txt echo "Yocto ARM64 toolchain = $versionARM64" >> ~/versions.txt +echo "Yocto MIPS64 toolchain = $versionMIPS64" >> ~/versions.txt -- cgit v1.2.3 From 80deae9b74d1cfc0717767c882f654be8ae67b05 Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Tue, 22 Jan 2019 11:54:55 +0200 Subject: Fix provisioning script dxsdk.ps1 Due to typo in dxsdk.ps1 provisioning script, it did not download from cached location. Also checksum Check was missing. Task-number: QTQAINFRA-2614 Change-Id: I321549721b256b85513fa1e4ff57ab1302e28f43 Reviewed-by: Heikki Halmet --- coin/provisioning/common/windows/dxsdk.ps1 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'coin/provisioning') diff --git a/coin/provisioning/common/windows/dxsdk.ps1 b/coin/provisioning/common/windows/dxsdk.ps1 index ce2bbeb3..f796ae1d 100644 --- a/coin/provisioning/common/windows/dxsdk.ps1 +++ b/coin/provisioning/common/windows/dxsdk.ps1 @@ -4,16 +4,16 @@ $package = "DXSDK_Jun10.exe" -$cacheUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package" +$cachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package" $officialUrl = "https://download.microsoft.com/download/A/E/7/AE743F1F-632B-4809-87A9-AA1BB3458E31/$package" -$sdkChecksum = "8fe98c00fde0f524760bb9021f438bd7d9304a69" -$exe = "C:\Windows\Temp\$package" - -Download $officialUrl $cachedUrl $exe +$sdkChecksumSha1 = "8fe98c00fde0f524760bb9021f438bd7d9304a69" +$package_path = "C:\Windows\Temp\$package" +Download $officialUrl $cachedUrl $package_path +Verify-Checksum $package_path $sdkChecksumSha1 sha1 Write-Host "Installing DirectX SDK" -Run-Executable $exe "/u" +Run-Executable $package_path "/u" -Remove-Item -Path $exe +Remove-Item -Path $package_path Write-Output "DirectX SDK = 9.29.1962 (Jun 10)" >> ~\versions.txt -- cgit v1.2.3 From abbd43c9430f3b7a28be791eb4e49840cb82dca0 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 21 Jan 2019 08:42:50 +0200 Subject: Provisioning: update ARMv7 and ARM64 toolchains MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update toolchains to Yocto Sumo release with GCC 7.3.0 Task-number: QTQAINFRA-2630 Change-Id: I078cfebde1df039a3783f76c37f914f0dda0483f Reviewed-by: Tony Sarajärvi Reviewed-by: Heikki Halmet --- .../qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'coin/provisioning') diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh index 604ac551..e5514332 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh @@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" echo "Installing Yocto toolchain for 32-bit b2qt ARMV7..." -versionARM="2.3.4" -package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarmv7-7608ebe.sh" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/pyro/$package" -AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/pyro/$package" -SHA1="db7a0f4f9ddd5992a563d5348889021a7ceb1c56" +versionARM="2.5.2" +package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarmv7-409ebc3.sh" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/sumo/$package" +AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/sumo/$package" +SHA1="a03b4eb492b16c6e60cf83c0718c27e9cfa6d522" yoctoInstaller="/tmp/yocto-toolchain-ARMv7.sh" yoctoLocationARMv7="/opt/yocto-armv7" sysrootARMv7="sysroots/armv7ahf-neon-poky-linux-gnueabi" @@ -60,11 +60,11 @@ rm -rf "$yoctoInstaller" echo "Installing Yocto toolchain for 64-bit b2qt ARM64..." -versionARM64="2.3.4" -package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarm64-7608ebe.sh" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/pyro/$package" -AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/pyro/$package" -SHA1="5dcae7c6cbc266798ba49a9e51fff1f06790729d" +versionARM64="2.5.2" +package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarm64-409ebc3.sh" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/sumo/$package" +AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/sumo/$package" +SHA1="3dadf1135d00f7cb5586b605b1f7344ae828c9cd" yoctoInstaller="/tmp/yocto-toolchain-ARM64.sh" yoctoLocationARM64="/opt/yocto-arm64" sysrootARM64="sysroots/aarch64-poky-linux" -- cgit v1.2.3 From da2bd45ba6655a10ea6f932a769c97ae6769ead5 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 13 Feb 2019 13:14:36 +0200 Subject: Provisioning: Update mysql to Windows Currently this is the last version that support x86 for at least Windows. Task-number: QTQAINFRA-1996 Change-Id: Idd55694837afad2188697b4d5cc009a127ddb760 Reviewed-by: Andy Shaw --- coin/provisioning/common/windows/mysql.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'coin/provisioning') diff --git a/coin/provisioning/common/windows/mysql.ps1 b/coin/provisioning/common/windows/mysql.ps1 index 29ce0ab4..8ed91402 100644 --- a/coin/provisioning/common/windows/mysql.ps1 +++ b/coin/provisioning/common/windows/mysql.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -36,7 +36,7 @@ # This script installs MySQL $version. # Both x86 and x64 versions needed when x86 integrations are done on x64 machine -$version = "5.6.11" +$version = "5.7.25" $baseNameX64 = "mysql-$version-winx64" $packagex64 = "C:\Windows\temp\$baseNameX64.zip" $baseNameX86 = "mysql-$version-win32" -- cgit v1.2.3 From 9c60d8b19081e57c51d5dd4942cac6c38ace3442 Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Thu, 14 Feb 2019 11:40:45 +0200 Subject: Fix: Set correct path to environmental variable Env variable BREAKPAD_SOURCE_DIR had /src at end which was not needed. Change-Id: I4d126c3b7c3b2da03dc2a0ba075b0d4ddad92eeb Reviewed-by: Miikka Heikkinen --- coin/provisioning/common/unix/install-breakpad.sh | 2 +- coin/provisioning/common/windows/install-breakpad.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'coin/provisioning') diff --git a/coin/provisioning/common/unix/install-breakpad.sh b/coin/provisioning/common/unix/install-breakpad.sh index 669469be..b05b3510 100755 --- a/coin/provisioning/common/unix/install-breakpad.sh +++ b/coin/provisioning/common/unix/install-breakpad.sh @@ -75,7 +75,7 @@ breakpadHome="$HOME/breakpad" ) -SetEnvVar "BREAKPAD_SOURCE_DIR" "$breakpadHome/src" +SetEnvVar "BREAKPAD_SOURCE_DIR" "$breakpadHome" echo "breakpad = $breakpad_commit_sha" >> ~/versions.txt echo "linux_syscall_support = $linux_syscall_support_commit_sha1" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/install-breakpad.ps1 b/coin/provisioning/common/windows/install-breakpad.ps1 index 4a9544cc..7db6d8ac 100644 --- a/coin/provisioning/common/windows/install-breakpad.ps1 +++ b/coin/provisioning/common/windows/install-breakpad.ps1 @@ -87,7 +87,7 @@ catch { git checkout $linux_syscall_support_commit_sha1 } -Set-EnvironmentVariable "BREAKPAD_SOURCE_DIR" "$installFolder\breakpad\src" +Set-EnvironmentVariable "BREAKPAD_SOURCE_DIR" "$installFolder\breakpad" # Write HEAD commit sha to versions txt, so build can be repeated at later date Write-Output "breakpad = $breakpad_commit_sha" >> ~/versions.txt -- cgit v1.2.3 From 06fb909429041b5e169e81bfc5c930fea7adf8fd Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Sat, 23 Feb 2019 08:20:08 +0200 Subject: Provisioning: Change installation order for dotnet-framework MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Windows updates can't be disabled before dotnet-framework is enabled Task-number: QTQAINFRA-2824 Change-Id: I26c6b9d9aacfd8031a0b05ce48e003822aec3bdc Reviewed-by: Tony Sarajärvi --- .../01-disable-windows-updates.ps1 | 1 - .../01-enable-dotnet-framework.ps1 | 22 ++++++++++++++++++++++ .../02-disable-windows-updates.ps1 | 1 + .../02-enable-dotnet-framework.ps1 | 22 ---------------------- 4 files changed, 23 insertions(+), 23 deletions(-) delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-updates.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/02-disable-windows-updates.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/02-enable-dotnet-framework.ps1 (limited to 'coin/provisioning') diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-updates.ps1 deleted file mode 100644 index 57428310..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-updates.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-windows-updates.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1 new file mode 100644 index 00000000..e7f4c248 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1 @@ -0,0 +1,22 @@ +# The DirectX SDK installer requires .Net framework 3.5 which isn't installed +# by default + +$netFeature = "NetFx3" +try { + $netFeatureState = (Get-WindowsOptionalFeature -Online -FeatureName "$netFeature").State + if ($netFeatureState -eq "Enabled") { + Write-Host ".Net Framework is already installed" + exit 0 + } +} catch { + Write-Host "Could not find .Net Framework Windows feature." + exit 1 +} + +Write-Host "Installing .Net Framework client" +try { + Enable-WindowsOptionalFeature -Online -FeatureName "$netFeature" -All -NoRestart +} catch { + Write-Host "Could not install .Net framework" + exit 1 +} diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-disable-windows-updates.ps1 new file mode 100644 index 00000000..57428310 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/02-disable-windows-updates.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-windows-updates.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-enable-dotnet-framework.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-enable-dotnet-framework.ps1 deleted file mode 100644 index e7f4c248..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/02-enable-dotnet-framework.ps1 +++ /dev/null @@ -1,22 +0,0 @@ -# The DirectX SDK installer requires .Net framework 3.5 which isn't installed -# by default - -$netFeature = "NetFx3" -try { - $netFeatureState = (Get-WindowsOptionalFeature -Online -FeatureName "$netFeature").State - if ($netFeatureState -eq "Enabled") { - Write-Host ".Net Framework is already installed" - exit 0 - } -} catch { - Write-Host "Could not find .Net Framework Windows feature." - exit 1 -} - -Write-Host "Installing .Net Framework client" -try { - Enable-WindowsOptionalFeature -Online -FeatureName "$netFeature" -All -NoRestart -} catch { - Write-Host "Could not install .Net framework" - exit 1 -} -- cgit v1.2.3 From d5c96aad5a9171d41ae195362187148084bc7f27 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 20 Feb 2019 15:48:42 +0200 Subject: Provisioning: Remove docker from macOS provisioning When docker provisioning starting test-server in virtual box whole virtual machine will reboot. Let's remove docker until it's more stable or we know how to fix it. Task-number: QTQAINFRA-2801 Change-Id: Iad7437a69c954a90522e44ef27015518fa3f8c1e (cherry picked from commit 1865b99b527bd9eee80c39e95d47a44096e44e6a) Reviewed-by: Aapo Keskimolo --- coin/provisioning/common/macos/docker.sh | 63 ------------------- .../provisioning/common/macos/docker_testserver.sh | 71 ---------------------- .../qtci-macos-10.12-x86_64/80-docker.sh | 4 -- .../qtci-macos-10.13-x86_64/80-docker.sh | 4 -- 4 files changed, 142 deletions(-) delete mode 100755 coin/provisioning/common/macos/docker.sh delete mode 100755 coin/provisioning/common/macos/docker_testserver.sh delete mode 100755 coin/provisioning/qtci-macos-10.12-x86_64/80-docker.sh delete mode 100755 coin/provisioning/qtci-macos-10.13-x86_64/80-docker.sh (limited to 'coin/provisioning') diff --git a/coin/provisioning/common/macos/docker.sh b/coin/provisioning/common/macos/docker.sh deleted file mode 100755 index 899bfee6..00000000 --- a/coin/provisioning/common/macos/docker.sh +++ /dev/null @@ -1,63 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2018 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 -ex - -# Download and install the Docker Toolbox for macOS (Docker Compose and Docker Machine). -url="https://download.docker.com/mac/stable/DockerToolbox.pkg" -target_file="DockerToolbox.pkg" - -if [ -x "$(command -v sha1sum)" ] -then - # This part shall be used in CI environment only. The DownloadURL script needs sha1sum - # which is not included in the default macOS system. In addition, the cached pkg can't - # be downloaded out of the Qt internal network. - case ${BASH_SOURCE[0]} in - */macos/*) UNIX_PATH="${BASH_SOURCE[0]%/macos/*}/unix" ;; - */*) UNIX_PATH="${BASH_SOURCE[0]%/*}/../unix" ;; - *) UNIX_PATH="../unix" ;; - esac - - source "$UNIX_PATH/DownloadURL.sh" - url_cached="http://ci-files01-hki.intra.qt.io/input/windows/DockerToolbox.pkg" - sha1="7196d2d30648d486978d29adb5837ff7876517c1" - DownloadURL $url_cached $url $sha1 $target_file -else - curl $url -o $target_file -fi -sudo installer -pkg $target_file -target / - -# Start testserver provisioning -source "${BASH_SOURCE%/*}/docker_testserver.sh" diff --git a/coin/provisioning/common/macos/docker_testserver.sh b/coin/provisioning/common/macos/docker_testserver.sh deleted file mode 100755 index 051386ea..00000000 --- a/coin/provisioning/common/macos/docker_testserver.sh +++ /dev/null @@ -1,71 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2018 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 -ex - -case ${BASH_SOURCE[0]} in - */macos/*) SERVER_PATH="${BASH_SOURCE[0]%/macos/*}/shared/testserver" ;; - */*) SERVER_PATH="${BASH_SOURCE[0]%/*}/../shared/testserver" ;; - *) SERVER_PATH="../shared/testserver" ;; -esac - -# testserver shared scripts -source "$SERVER_PATH/testserver_util.sh" - -# Nested virtualization - Print CPU features to verify that CI has enabled VT-X/AMD-v support -cpu_features=$(sysctl -a | grep machdep.cpu.features) -case $cpu_features in - *VMX*) ;; - *) echo "VMX not found error! Please make sure Coin has enabled VT-X/AMD-v." >&2; exit 1 ;; -esac - -# Create docker virtual machine (Boot2docker) -source "$SERVER_PATH/docker_machine.sh" - -# Using SHA-1 of each server context as the tag of docker images. A tag labels a -# specific image version. It is used by docker compose file (docker-compose.yml) -# to launch the corresponding docker containers. If one of the server contexts -# (./apache2, ./danted, ...) gets changes, all the related compose files in -# qtbase should be updated as well. - -source "$SERVER_PATH/settings.sh" - -for server in $testserver -do - context="$SERVER_PATH/$server" - docker build -t qt-test-server-$server:$(sha1tree $context) $context -done - -docker images diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/80-docker.sh b/coin/provisioning/qtci-macos-10.12-x86_64/80-docker.sh deleted file mode 100755 index a5d362cb..00000000 --- a/coin/provisioning/qtci-macos-10.12-x86_64/80-docker.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/docker.sh diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/80-docker.sh b/coin/provisioning/qtci-macos-10.13-x86_64/80-docker.sh deleted file mode 100755 index a5d362cb..00000000 --- a/coin/provisioning/qtci-macos-10.13-x86_64/80-docker.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/docker.sh -- cgit v1.2.3 From 099b7ffe4c386b8997ce2f8014f7f8442a9190a1 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 18 Feb 2019 09:38:02 +0200 Subject: Provisioning: Update emsdk version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-73867 Change-Id: I2aabbecbce2fc3378db6c0747fc8146c03fac545 Reviewed-by: Morten Johan Sørvig --- coin/provisioning/common/linux/emsdk.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'coin/provisioning') diff --git a/coin/provisioning/common/linux/emsdk.sh b/coin/provisioning/common/linux/emsdk.sh index 64753844..284eb19d 100755 --- a/coin/provisioning/common/linux/emsdk.sh +++ b/coin/provisioning/common/linux/emsdk.sh @@ -39,7 +39,7 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" # shellcheck source=../unix/DownloadURL.sh source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" -version="1.38.1" +version="1.38.16" version_node="8.9.1" urlEmscriptenCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten-$version.tar.gz" urlEmscriptenExternal="https://github.com/kripken/emscripten/archive/$version.tar.gz" @@ -47,8 +47,8 @@ urlEmscriptenLlvmCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten urlEmscriptenLlvmExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/llvm/tag/linux_64bit/emscripten-llvm-e$version.tar.gz" urlNodeCache="http://ci-files01-hki.intra.qt.io/input/emsdk/node-v$version_node-linux-x64.tar.xz" urlNodeExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/node-v$version_node-linux-x64.tar.xz" -sha1Emscripten="62243b4219f6ad7f6d4bd5ae4abb27aecb87ffb3" -sha1EmscriptenLlvm="933ea5feab3aa5acc5c1e15a0deccf0e3fbeb0a7" +sha1Emscripten="353ad7bf614f73b73ed1d05aedd66321d679e03d" +sha1EmscriptenLlvm="e132c26ad657c07f88cc550fd23f1d6f1b6c0673" sha1Node="eaec5de2af934f7ebc7f9597983e71c5d5a9a726" targetFolder="/opt/emsdk" sudo mkdir "$targetFolder" -- cgit v1.2.3 From abfc2cd5719707b242db71da4192598900f094dd Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 18 Feb 2019 10:19:07 +0200 Subject: Provisioning: Update emsdk version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-73867 Change-Id: I4caab8d434787bf4323e1ea3232bf4bf23c1ec8d Reviewed-by: Juha Karjalainen Reviewed-by: Morten Johan Sørvig --- coin/provisioning/common/linux/emsdk.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'coin/provisioning') diff --git a/coin/provisioning/common/linux/emsdk.sh b/coin/provisioning/common/linux/emsdk.sh index 64753844..3515b870 100755 --- a/coin/provisioning/common/linux/emsdk.sh +++ b/coin/provisioning/common/linux/emsdk.sh @@ -39,7 +39,7 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" # shellcheck source=../unix/DownloadURL.sh source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" -version="1.38.1" +version="1.38.27" version_node="8.9.1" urlEmscriptenCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten-$version.tar.gz" urlEmscriptenExternal="https://github.com/kripken/emscripten/archive/$version.tar.gz" @@ -47,8 +47,8 @@ urlEmscriptenLlvmCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten urlEmscriptenLlvmExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/llvm/tag/linux_64bit/emscripten-llvm-e$version.tar.gz" urlNodeCache="http://ci-files01-hki.intra.qt.io/input/emsdk/node-v$version_node-linux-x64.tar.xz" urlNodeExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/node-v$version_node-linux-x64.tar.xz" -sha1Emscripten="62243b4219f6ad7f6d4bd5ae4abb27aecb87ffb3" -sha1EmscriptenLlvm="933ea5feab3aa5acc5c1e15a0deccf0e3fbeb0a7" +sha1Emscripten="ff9748a8f6b8eaa8192cce9fe2befc801443a161" +sha1EmscriptenLlvm="8f5cd026c98cd40e53e6d11fbc32b116280ef9bb" sha1Node="eaec5de2af934f7ebc7f9597983e71c5d5a9a726" targetFolder="/opt/emsdk" sudo mkdir "$targetFolder" -- cgit v1.2.3 From 88b35a49212e4151b955a7604e20f67be0b62c9c Mon Sep 17 00:00:00 2001 From: Johanna Aijala Date: Wed, 28 Nov 2018 15:33:40 +0200 Subject: Update Squish to 6.4.3 Froglogic has not yet released Squish for Qt5.13 but we can use Squish packages build with Qt5.12. Remove msvc12 Squish, not needed. Change-Id: I1de1bb67a5577fa7f7233c69c3a58bedd15fd16b Reviewed-by: Heikki Halmet --- coin/provisioning/common/unix/squishInstall.sh | 4 ++-- coin/provisioning/common/windows/squishInstall.ps1 | 28 ++++++++++++---------- 2 files changed, 17 insertions(+), 15 deletions(-) (limited to 'coin/provisioning') diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index 4a7a6837..b40c1922 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -38,9 +38,9 @@ set -ex # This script will install squish package for Linux and Mac. # Squish is need by Release Test Automation (RTA) -version="6.3.2" +version="6.4.3" # Branch version without dot -qtBranch="510x" +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" diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index 5fb032f5..21dfea39 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -38,18 +38,18 @@ # NOTE! Make sure 64bit versions are always installed before 32bit, # because they use same folder name before a rename -$version = "6.3.2" +$version = "6.4.3" # Qt branch without dot (*.*) -$qtBranch = "510x" -# So far Squish built with Qt5.10 works also with 5.11, but we have to be prepared that on some point +$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 = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin\$testSuite.7z" +$testSuiteUrl = "$squishUrl\$testSuite.7z" # Squish license $licensePackage = ".squish-3-license" @@ -62,7 +62,10 @@ Function DownloadAndInstallSquish { [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" @@ -125,25 +128,24 @@ DownloadSquishLicence $squishUrl if ($OSVersion -eq "Windows 10 Enterprise") { if (Is64BitWinHost) { - DownloadAndInstallSquish $version win64 msvc14 + DownloadAndInstallSquish $version win64 "msvc14" + DownloadAndInstallSquish $version win64 "mingw_gcc73_posix_seh" + } else { + DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf" } - DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf" - DownloadAndInstallSquish $version win32 "msvc14" + DownloadAndInstallSquish $version win32 "msvc141" } elseif ($OSVersion -eq "Windows 8.1 Enterprise") { if (Is64BitWinHost) { - DownloadAndInstallSquish $version win64 "msvc12" DownloadAndInstallSquish $version win64 "msvc14" } - DownloadAndInstallSquish $version win32 "msvc14" + DownloadAndInstallSquish $version win32 "msvc141" } elseif ($OSVersion -eq "Windows 7 Enterprise") { if (Is64BitWinHost) { - DownloadAndInstallSquish $version win64 "msvc12" DownloadAndInstallSquish $version win64 "msvc14" } - DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf" - DownloadAndInstallSquish $version win32 "msvc14" + DownloadAndInstallSquish $version win32 "msvc141" } -- cgit v1.2.3 From 76c80866af78274eeb973ab38ad7b44f216b1a1e Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 15 Feb 2019 13:28:47 +0200 Subject: Provisioning: Help script for removing items MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sometimes items are locked (access denied) so we need to have function which waits and retry until removing is possible. Task-number: QTQAINFRA-2806 Change-Id: I09055c45c0e439ed1a20eb575ee79b7ca22c5745 Reviewed-by: Tony Sarajärvi Reviewed-by: Frederik Gladhorn --- coin/provisioning/common/windows/helpers.ps1 | 19 +++++++++++++++++++ coin/provisioning/common/windows/vc_redist.ps1 | 3 +-- 2 files changed, 20 insertions(+), 2 deletions(-) (limited to 'coin/provisioning') diff --git a/coin/provisioning/common/windows/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1 index 76ad4867..f5318bcb 100644 --- a/coin/provisioning/common/windows/helpers.ps1 +++ b/coin/provisioning/common/windows/helpers.ps1 @@ -159,3 +159,22 @@ function IsProxyEnabled { function Get-Proxy { return (Get-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings').proxyServer } + +function Remove { + + Param ( + [string]$Path = $(BadParam("a path")) + ) + Write-Host "Removing $Path" + $i = 0 + While ( Test-Path($Path) ){ + Try{ + remove-item -Force -Recurse -Path $Path -ErrorAction Stop + }catch{ + $i +=1 + if ($i -eq 5) {exit 1} + Write-Verbose "$Path locked, trying again in 5" + Start-Sleep -seconds 5 + } + } +} diff --git a/coin/provisioning/common/windows/vc_redist.ps1 b/coin/provisioning/common/windows/vc_redist.ps1 index f68846f0..1cd81a37 100644 --- a/coin/provisioning/common/windows/vc_redist.ps1 +++ b/coin/provisioning/common/windows/vc_redist.ps1 @@ -57,5 +57,4 @@ Download $externalUrl $internalUrl $package Verify-Checksum $package $sha1 Write-Host "Installing $package..." Run-Executable $package "/q" -Write-Host "Remove $package..." -Remove-Item -Force -Path $package +Remove $package -- cgit v1.2.3 From 675deb147463a9354aebd4a487783a41d578917c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johanna=20=C3=84ij=C3=A4l=C3=A4?= Date: Fri, 8 Mar 2019 07:41:10 -0800 Subject: Add Squish for MSVC2017 x64 to Win10 x64 machines Also Squish for MinGW x86 on Win7 x86. Change-Id: Ie73371b7993f94f32ef1cd2b90f340cf20935e0b Reviewed-by: Heikki Halmet --- coin/provisioning/common/windows/squishInstall.ps1 | 3 +++ 1 file changed, 3 insertions(+) (limited to 'coin/provisioning') diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index 21dfea39..de04d242 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -129,6 +129,7 @@ if ($OSVersion -eq "Windows 10 Enterprise") { if (Is64BitWinHost) { DownloadAndInstallSquish $version win64 "msvc14" + DownloadAndInstallSquish $version win64 "msvc141" DownloadAndInstallSquish $version win64 "mingw_gcc73_posix_seh" } else { DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf" @@ -146,6 +147,8 @@ if ($OSVersion -eq "Windows 10 Enterprise") { if (Is64BitWinHost) { DownloadAndInstallSquish $version win64 "msvc14" + } else { + DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf" } DownloadAndInstallSquish $version win32 "msvc141" } -- cgit v1.2.3 From 48ab1d879bc5dc1f65ee6671e546f58ae1c67bee Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Fri, 22 Feb 2019 13:38:26 +0200 Subject: Fix provisioning disable defragmentation for windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If no scheduled task exist it would throw error causing provisioning to fail. Now catch when scheduling does not exist. Task-number: QTQAINFRA-2823 Change-Id: I3bf24df6116b6c978171950bf5bf954f5ddee533 Reviewed-by: Tony Sarajärvi --- .../common/windows/disable-defragment.ps1 | 42 ++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) (limited to 'coin/provisioning') diff --git a/coin/provisioning/common/windows/disable-defragment.ps1 b/coin/provisioning/common/windows/disable-defragment.ps1 index 876938f8..e76f0649 100644 --- a/coin/provisioning/common/windows/disable-defragment.ps1 +++ b/coin/provisioning/common/windows/disable-defragment.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -31,4 +31,42 @@ ## ############################################################################# -schtasks /Delete /TN "\Microsoft\Windows\Defrag\ScheduledDefrag" /F +# Windows 7 does not have Get-ScheduledTask and Unregister-ScheduledTask +# thus needing its own version. +Write-Host "Disabling defragmentation" +$version = Get-CimInstance Win32_OperatingSystem | Select-Object -ExpandProperty Caption +if ($version -like '*Windows 7*'){ + $pi = New-Object System.Diagnostics.ProcessStartInfo + $pi.FileName = "C:\Windows\System32\schtasks.exe" + $pi.RedirectStandardError = $true + $pi.UseShellExecute = $false + $pi.Arguments = "/Delete /TN `"\Microsoft\Windows\Defrag\ScheduledDefrag`" /F" + $prog = New-Object System.Diagnostics.Process + $prog.StartInfo = $pi + $prog.Start() | Out-Null + $err = $prog.StandardError.ReadToEnd() + $prog.WaitForExit() + if ($prog.ExitCode -eq 0){ + Write-Host "Scheduled defragmentation removed" + } else { + if ($err -like '*cannot find the file*'){ + Write-Host "No scheduled defragmentation task found" + exit 0 + } else { + Write-Host "Error while deleting scheduled defragmentation task: $err" + } + } +} +else { + try { + $state = (Get-ScheduledTask -ErrorAction Stop -TaskName "ScheduledDefrag").State + Write-Host "Scheduled defragmentation task found in state: $state" + } + catch { + Write-Host "No scheduled defragmentation task found" + exit 0 + } + Write-Host "Unregistering scheduled defragmentation task" + Unregister-ScheduledTask -ErrorAction Stop -Confirm:$false -TaskName ScheduledDefrag + Write-Host "Scheduled Defragmentation task was cancelled" +} -- cgit v1.2.3 From 3d087c5a6a815041e0e8dec206f2b0b3e51f1a03 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Fri, 15 Feb 2019 12:19:28 +0100 Subject: Split docker provisioning files Split the creation of the test images and the creation of the docker environment. This way, one can easily recreate the test images, without requiring to re-provision everything. Change-Id: I35bbe8d8bf497f16d9be92cbaa2d9001f8eee247 Reviewed-by: Maurice Kalinowski Reviewed-by: Ryan Chu --- .../common/shared/testserver/docker_images.sh | 68 ++++++++++++++++++++++ .../common/shared/testserver/docker_testserver.sh | 27 +-------- 2 files changed, 70 insertions(+), 25 deletions(-) create mode 100755 coin/provisioning/common/shared/testserver/docker_images.sh (limited to 'coin/provisioning') diff --git a/coin/provisioning/common/shared/testserver/docker_images.sh b/coin/provisioning/common/shared/testserver/docker_images.sh new file mode 100755 index 00000000..e98183d8 --- /dev/null +++ b/coin/provisioning/common/shared/testserver/docker_images.sh @@ -0,0 +1,68 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2019 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 -ex + +[ -x "$(command -v realpath)" ] && FILE=$(realpath ${BASH_SOURCE[0]}) || FILE=${BASH_SOURCE[0]} +case $FILE in + */*) SERVER_PATH="${FILE%/*}" ;; + *) SERVER_PATH="." ;; +esac + +# Sort files by their SHA-1, and then return the accumulated result +sha1tree () { + # For example, macOS doesn't install sha1sum by default. In such case, it uses shasum instead. + [ -x "$(command -v sha1sum)" ] || SHASUM=shasum + + find "$@" -type f -print0 | \ + xargs -0 ${SHASUM-sha1sum} | cut -d ' ' -f 1 | \ + sort | ${SHASUM-sha1sum} | cut -d ' ' -f 1 +} + +# Using SHA-1 of each server context as the tag of docker images. A tag labels a +# specific image version. It is used by docker compose file (docker-compose.yml) +# to launch the corresponding docker containers. If one of the server contexts +# (./apache2, ./danted, ...) gets changes, all the related compose files in +# qtbase should be updated as well. + +source "$SERVER_PATH/settings.sh" + +for server in $testserver +do + context="$SERVER_PATH/$server" + docker build -t qt-test-server-$server:$(sha1tree $context) $context +done + +docker images diff --git a/coin/provisioning/common/shared/testserver/docker_testserver.sh b/coin/provisioning/common/shared/testserver/docker_testserver.sh index 83baa488..3a7c87e8 100755 --- a/coin/provisioning/common/shared/testserver/docker_testserver.sh +++ b/coin/provisioning/common/shared/testserver/docker_testserver.sh @@ -53,28 +53,5 @@ esac # Display system-wide information of docker-engine docker info -# Sort files by their SHA-1, and then return the accumulated result -sha1tree () { - # For example, macOS doesn't install sha1sum by default. In such case, it uses shasum instead. - [ -x "$(command -v sha1sum)" ] || SHASUM=shasum - - find "$@" -type f -print0 | \ - xargs -0 ${SHASUM-sha1sum} | cut -d ' ' -f 1 | \ - sort | ${SHASUM-sha1sum} | cut -d ' ' -f 1 -} - -# Using SHA-1 of each server context as the tag of docker images. A tag labels a -# specific image version. It is used by docker compose file (docker-compose.yml) -# to launch the corresponding docker containers. If one of the server contexts -# (./apache2, ./danted, ...) gets changes, all the related compose files in -# qtbase should be updated as well. - -source "$SERVER_PATH/settings.sh" - -for server in $testserver -do - context="$SERVER_PATH/$server" - docker build -t qt-test-server-$server:$(sha1tree $context) $context -done - -docker images +# Create images +$SERVER_PATH/docker_images.sh -- cgit v1.2.3 From 0660a25cca3c922346653e1bc486a0c8aa59f5aa Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 19 Feb 2019 14:00:21 +0200 Subject: Provisioning: Make gnuwin32 available for windows machines MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This script will install gnuwin32 to the windows machines so it can be removed from qt5 Task-number: QTBUG-73422 Change-Id: I40b7963efcf047525626fe6f1e3ba50b54d68199 Reviewed-by: Juha Karjalainen Reviewed-by: Tony Sarajärvi --- .../common/windows/install-gnuwin32.ps1 | 46 ++++++++++++++++++++++ .../qtci-windows-10-x86/36-install-gnuwin32.ps1 | 2 + .../qtci-windows-10-x86_64/36-install-gnuwin32.ps1 | 2 + .../qtci-windows-7-x86/36-install-gnuwin32.ps1 | 2 + .../qtci-windows-7-x86_64/36-install-gnuwin32.ps1 | 2 + .../qtci-windows-8.1-x86/36-install-gnuwin32.ps1 | 2 + .../36-install-gnuwin32.ps1 | 2 + 7 files changed, 58 insertions(+) create mode 100644 coin/provisioning/common/windows/install-gnuwin32.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/36-install-gnuwin32.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/36-install-gnuwin32.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/36-install-gnuwin32.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/36-install-gnuwin32.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/36-install-gnuwin32.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/36-install-gnuwin32.ps1 (limited to 'coin/provisioning') diff --git a/coin/provisioning/common/windows/install-gnuwin32.ps1 b/coin/provisioning/common/windows/install-gnuwin32.ps1 new file mode 100644 index 00000000..99862b3c --- /dev/null +++ b/coin/provisioning/common/windows/install-gnuwin32.ps1 @@ -0,0 +1,46 @@ +############################################################################ +## +## Copyright (C) 2019 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$ +## +############################################################################ +. "$PSScriptRoot\helpers.ps1" + +# This script will install gnuwin32 + +$prog = "gnuwin32" +$zipPackage = "$prog.zip" +$temp = "$env:tmp" +$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/$prog/$zipPackage" +$externalUrl = "http://download.qt.io/development_releases/$prog/$zipPackage" +Download $externalUrl $internalUrl "$temp\$zipPackage" +Verify-Checksum "$temp\$zipPackage" "d7a34a385ccde2374b8a2ca3369e5b8a1452c5a5" +Extract-7Zip "$temp\$zipPackage" C:\Utils + +Write-Output "$prog qt5 commit sha = 98c4f1bbebfb3cc6d8e031d36fd1da3c19e634fb" >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86/36-install-gnuwin32.ps1 b/coin/provisioning/qtci-windows-10-x86/36-install-gnuwin32.ps1 new file mode 100644 index 00000000..0e2abbac --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/36-install-gnuwin32.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1" + diff --git a/coin/provisioning/qtci-windows-10-x86_64/36-install-gnuwin32.ps1 b/coin/provisioning/qtci-windows-10-x86_64/36-install-gnuwin32.ps1 new file mode 100644 index 00000000..0e2abbac --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/36-install-gnuwin32.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1" + diff --git a/coin/provisioning/qtci-windows-7-x86/36-install-gnuwin32.ps1 b/coin/provisioning/qtci-windows-7-x86/36-install-gnuwin32.ps1 new file mode 100644 index 00000000..0e2abbac --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/36-install-gnuwin32.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1" + diff --git a/coin/provisioning/qtci-windows-7-x86_64/36-install-gnuwin32.ps1 b/coin/provisioning/qtci-windows-7-x86_64/36-install-gnuwin32.ps1 new file mode 100644 index 00000000..0e2abbac --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/36-install-gnuwin32.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1" + diff --git a/coin/provisioning/qtci-windows-8.1-x86/36-install-gnuwin32.ps1 b/coin/provisioning/qtci-windows-8.1-x86/36-install-gnuwin32.ps1 new file mode 100644 index 00000000..0e2abbac --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/36-install-gnuwin32.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1" + diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/36-install-gnuwin32.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/36-install-gnuwin32.ps1 new file mode 100644 index 00000000..0e2abbac --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/36-install-gnuwin32.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1" + -- cgit v1.2.3 From c71f0041719f7ab58d4a5bf1b76cd2ac681486be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johanna=20=C3=84ij=C3=A4l=C3=A4?= Date: Thu, 14 Mar 2019 14:02:25 -0700 Subject: Provisioning: add dependency walker to win10 x86 Needed by RTA. Change-Id: I51889477dd6e6f4bdff509ab8f6c1b8307842ebd Reviewed-by: Friedemann Kleint Reviewed-by: Heikki Halmet --- coin/provisioning/qtci-windows-10-x86/09-install-dependencywalker.ps1 | 1 + 1 file changed, 1 insertion(+) create mode 100644 coin/provisioning/qtci-windows-10-x86/09-install-dependencywalker.ps1 (limited to 'coin/provisioning') diff --git a/coin/provisioning/qtci-windows-10-x86/09-install-dependencywalker.ps1 b/coin/provisioning/qtci-windows-10-x86/09-install-dependencywalker.ps1 new file mode 100644 index 00000000..331de489 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/09-install-dependencywalker.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-dependencywalker.ps1" -- cgit v1.2.3 From a97d669a2055b6e989e5d274da6cb14fafc66041 Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Tue, 12 Mar 2019 11:31:53 +0200 Subject: Provisioning: Remove certificate printing to log macOS openssl provisioning printed certificates to log. This patch prevent printing certificates to log by redirecting it to /dev/null Task-number: QTQAINFRA-2841 Change-Id: I9ec120212a1f068fa040a302cb50e775857cbb74 Reviewed-by: Iikka Eklund Reviewed-by: Aapo Keskimolo --- coin/provisioning/common/macos/install_openssl.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'coin/provisioning') diff --git a/coin/provisioning/common/macos/install_openssl.sh b/coin/provisioning/common/macos/install_openssl.sh index 15f02ffd..3b1978e2 100755 --- a/coin/provisioning/common/macos/install_openssl.sh +++ b/coin/provisioning/common/macos/install_openssl.sh @@ -73,8 +73,8 @@ SetEnvVar "OPENSSL_DIR" "\"$openssl_install_dir\"" SetEnvVar "OPENSSL_INCLUDE" "\"$openssl_install_dir/include\"" SetEnvVar "OPENSSL_LIB" "\"$openssl_install_dir/lib\"" -security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem -security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem +security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem > /dev/null +security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem > /dev/null sudo rm -rf /tmp/openssl-$opensslVersion -- cgit v1.2.3 From c09135cb56e03dd6a09b79f2c6e15932e9433df2 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 17 Jan 2019 15:24:27 +0200 Subject: Provisioning: Update Android NDK to version r19 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also let's start using 64-bit Android NDK for Windows Task-number: QTQAINFRA-2568 Change-Id: I2d757aa9e43abf5118abad7bf644e17e88a2ca94 Reviewed-by: Qt CI Bot Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/linux/android_linux.sh | 4 ++-- coin/provisioning/common/windows/android.ps1 | 10 +++++----- coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'coin/provisioning') diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index c77af943..a15bcf03 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -51,13 +51,13 @@ basePath="http://ci-files01-hki.intra.qt.io/input/android" toolsVersion="r26.1.1" toolsFile="sdk-tools-linux-4333796.zip" -ndkVersion="r18b" +ndkVersion="r19c" ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip" sdkBuildToolsVersion="28.0.3" sdkApiLevel="android-28" toolsSha1="8c7c28554a32318461802c1291d76fccfafde054" -ndkSha1="500679655da3a86aecf67007e8ab230ea9b4dd7b" +ndkSha1="fd94d0be6017c6acbd193eb95e09cf4b6f61b834" toolsTargetFile="/tmp/$toolsFile" toolsSourceFile="$basePath/$toolsFile" diff --git a/coin/provisioning/common/windows/android.ps1 b/coin/provisioning/common/windows/android.ps1 index 1b4dd35d..def09116 100644 --- a/coin/provisioning/common/windows/android.ps1 +++ b/coin/provisioning/common/windows/android.ps1 @@ -40,10 +40,10 @@ # That's why we need to use Andoid-21 API version in Qt 5.9. # NDK -$ndkVersion = "r18b" -$ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows-x86.zip" -$ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86.zip" -$ndkChecksum = "4b8b6a4edc0fa967b429c1d6d25adf69acc28803" +$ndkVersion = "r19c" +$ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows-x86_64.zip" +$ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86_64.zip" +$ndkChecksum = "c4cd8c0b6e7618ca0a871a5f24102e40c239f6a3" $ndkFolder = "c:\Utils\Android\android-ndk-$ndkVersion" $ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip" @@ -98,7 +98,7 @@ Out-File -FilePath C:\Utils\Android\licenses\android-sdk-license -Encoding utf8 cd $toolsFolder\bin\ $sdkmanager_args += "platforms;$sdkApiLevel", "platform-tools", "build-tools;$sdkBuildToolsVersion" $command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat @sdkmanager_args' -iex $command +Invoke-Expression $command $command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat --licenses' iex $command cmd /c "dir C:\Utils\android" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh index 9d7467ef..97df7e57 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh @@ -51,14 +51,14 @@ toolsVersion="r26.1.1" # toolsFile dertermines tools version toolsFile="sdk-tools-darwin-4333796.zip" -ndkVersion="r18b" +ndkVersion="r19c" ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip" sdkBuildToolsVersion="28.0.3" # this is compile sdk version sdkApiLevel="android-28" toolsSha1="ed85ea7b59bc3483ce0af4c198523ba044e083ad" -ndkSha1="98cb9909aa8c2dab32db188bbdc3ac6207e09440" +ndkSha1="f46b8193109bba8a58e0461c1a48f4534051fb25" toolsTargetFile="/tmp/$toolsFile" toolsSourceFile="$basePath/$toolsFile" -- cgit v1.2.3 From f678ae3769e69ffc3afbd2f45ef60c92e4db5f08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 26 Mar 2019 09:46:17 +0200 Subject: Fix soft links and file modes of a few macOS provisioning scripts Change-Id: I1d4d09424aa2ce0b75d840a2c26cbfed99740d0c Reviewed-by: Qt CI Bot Reviewed-by: Heikki Halmet --- .../01-sha1sum-compatibility.sh | 42 +++++++++++++++++++++- .../qtci-macos-10.12-x86_64/02-disable-ntp.sh | 0 .../01-sha1sum-compatibility.sh | 19 +++------- .../qtci-macos-10.13-x86_64/35-install-breakpad.sh | 0 4 files changed, 46 insertions(+), 15 deletions(-) mode change 120000 => 100755 coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh mode change 100644 => 100755 coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh mode change 100644 => 100755 coin/provisioning/qtci-macos-10.13-x86_64/35-install-breakpad.sh (limited to 'coin/provisioning') diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh b/coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh deleted file mode 120000 index 58a40af4..00000000 --- a/coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh +++ /dev/null @@ -1 +0,0 @@ -../common/macos/sha1sum-compatibility.sh \ No newline at end of file diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh b/coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh new file mode 100755 index 00000000..52650fea --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2018 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$ +## +############################################################################# + +#!/usr/bin/env bash + +set -ex + +# shellcheck source=../common/macos/sha1sum-compatibility.sh +source "${BASH_SOURCE%/*}/../common/macos/sha1sum-compatibility.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh old mode 100644 new mode 100755 diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/01-sha1sum-compatibility.sh b/coin/provisioning/qtci-macos-10.13-x86_64/01-sha1sum-compatibility.sh index c3936499..52650fea 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/01-sha1sum-compatibility.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/01-sha1sum-compatibility.sh @@ -33,18 +33,9 @@ ## ############################################################################# -# On macOS the sha1 tool is named 'shasum' while on all other unix systems it is called 'sha1sum'. -# In order to make all unix provioning scripts run on macOS without special case handling -# a symbolic link is created. -# The shasum tool is a perl script which does some globbing to determine the perl version. The -# symbolic link has to point directly to the binary including the perl version. -# Additionally the CI seems to have multiple parallel perl versions installed which causes -# multiple shasum tools to be present (shasum5.16, shasum5.18). -# -# Currently this is -# /usr/local/bin/sha1sum -> /usr/bin/shasum5.18 +#!/usr/bin/env bash + +set -ex -[ -d /usr/local/bin ] || sudo mkdir -p /usr/local/bin -# shellcheck disable=SC2012 -SHASUM_TOOLNAME=$(ls -r /usr/bin/shasum?.* | head -n1) -sudo ln -s "${SHASUM_TOOLNAME}" /usr/local/bin/sha1sum +# shellcheck source=../common/macos/sha1sum-compatibility.sh +source "${BASH_SOURCE%/*}/../common/macos/sha1sum-compatibility.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/35-install-breakpad.sh b/coin/provisioning/qtci-macos-10.13-x86_64/35-install-breakpad.sh old mode 100644 new mode 100755 -- cgit v1.2.3 From b2afcc84055a7d1fe8c8ede56961d52e19782a04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 26 Mar 2019 13:01:21 +0200 Subject: Fix shellcheck complaints from provisioning scripts Change-Id: I8d1ee4241d7e99269e8c717ceb2aecde3194c51a Reviewed-by: Qt CI Bot Reviewed-by: Heikki Halmet --- .../qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh | 3 ++- .../qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh | 1 + coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh | 5 +++-- .../qtci-linux-Ubuntu-16.04-x86_64/02-disable-ntp.sh | 1 + .../qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh | 3 +++ coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh | 2 +- .../qtci-linux-Ubuntu-16.04-x86_64/35-install-breakpad.sh | 0 .../qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh | 1 + coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh | 2 +- coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh | 1 + coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh | 1 + coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/80-docker.sh | 2 +- coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/90-squish.sh | 2 +- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh | 2 +- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh | 1 + coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh | 4 +++- .../04-yocto_ssh_configurations.sh | 1 + .../10-openssl_for_android_linux.sh | 1 + .../qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh | 3 +++ coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh | 1 + coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh | 1 + coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh | 2 +- .../qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh | 1 + coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh | 2 +- .../qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh | 3 ++- coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/55-emsdk.sh | 1 + coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh | 4 +++- .../qtci-macos-10.12-x86_64/06-disable_spotlight.sh | 5 ++++- coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh | 4 +++- .../qtci-macos-10.12-x86_64/21-install-commandlinetools.sh | 1 + coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh | 1 + coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh | 1 + coin/provisioning/qtci-macos-10.12-x86_64/26-odbc.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh | 1 + coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh | 10 +++++----- coin/provisioning/qtci-macos-10.12-x86_64/90-squish.sh | 4 +++- coin/provisioning/qtci-macos-10.13-x86_64/02-disable-ntp.sh | 3 ++- .../qtci-macos-10.13-x86_64/06-disable_spotlight.sh | 5 ++++- coin/provisioning/qtci-macos-10.13-x86_64/15-xz.sh | 2 +- coin/provisioning/qtci-macos-10.13-x86_64/20-java.sh | 4 +++- .../qtci-macos-10.13-x86_64/21-install-commandlinetools.sh | 1 + coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh | 2 +- coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh | 2 +- coin/provisioning/qtci-macos-10.13-x86_64/25-pip.sh | 2 +- coin/provisioning/qtci-macos-10.13-x86_64/25-python2.sh | 1 + coin/provisioning/qtci-macos-10.13-x86_64/25-python3.sh | 1 + coin/provisioning/qtci-macos-10.13-x86_64/26-odbc.sh | 2 +- coin/provisioning/qtci-macos-10.13-x86_64/26-virtualenv.sh | 2 +- coin/provisioning/qtci-macos-10.13-x86_64/27-libclang.sh | 2 +- coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh | 5 ----- coin/provisioning/qtci-macos-10.13-x86_64/30-fbx.sh | 2 +- coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh | 1 + coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh | 10 +++++----- coin/provisioning/qtci-macos-10.13-x86_64/90-squish.sh | 4 +++- 60 files changed, 93 insertions(+), 50 deletions(-) mode change 100644 => 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/35-install-breakpad.sh (limited to 'coin/provisioning') 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 addfb673..e86870c0 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 @@ -124,7 +124,8 @@ sudo pip install virtualenv wheel 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 +/usr/local/bin/pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" +# shellcheck source=../common/unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh index 938ef37c..b917d292 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh @@ -37,6 +37,7 @@ set -ex +# shellcheck source=../common/unix/check_and_set_proxy.sh source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" NTS_IP=10.212.2.216 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 4559151e..f2eb6e60 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 @@ -45,7 +45,7 @@ for service in apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-dai done # aptdaemon is used by update notifiers and similar and there is no point in having those (the symptom is aptd holding a lock) -for i in `seq 10`; do +for i in $(seq 10); do echo attempting to remove aptdaemon sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y remove aptdaemon || true # check that aptdaemon is no longer installed @@ -178,7 +178,8 @@ echo "Installing packages" sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}" # Install all needed packages in a special wheel cache directory -pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt +pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" +# shellcheck source=../common/unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-disable-ntp.sh index ca31a876..89806892 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-disable-ntp.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-disable-ntp.sh @@ -1,3 +1,4 @@ #!/usr/bin/env bash +# shellcheck source=../common/linux/disable-ntp_linux.sh source "${BASH_SOURCE%/*}/../common/linux/disable-ntp_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh index c2331d16..96b197ea 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh @@ -33,4 +33,7 @@ ## ############################################################################# +set -ex + +# shellcheck source=../common/unix/mqtt_broker.sh source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh index ca24a70e..d8df4375 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/linux/fbx_linux.sh +"$BASEDIR/../common/linux/fbx_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/35-install-breakpad.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/35-install-breakpad.sh old mode 100644 new mode 100755 diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh index 6784335a..0527fe85 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh @@ -35,4 +35,5 @@ set -ex +# shellcheck source=../common/linux/android_linux.sh source "${BASH_SOURCE%/*}/../common/linux/android_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh index 8f81a7dd..db8a3ff5 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh @@ -1,5 +1,5 @@ #!/bin/bash BASEDIR=$(dirname "$0") -$BASEDIR/../common/linux/cmake_linux.sh +"$BASEDIR/../common/linux/cmake_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh index 37aec494..4034162e 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh @@ -35,4 +35,5 @@ set -ex +# shellcheck source=../common/linux/qnx_660.sh source "${BASH_SOURCE%/*}/../common/linux/qnx_660.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh index c4740556..a2d162d3 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh @@ -35,4 +35,5 @@ set -ex +# shellcheck source=../common/linux/qnx_700.sh source "${BASH_SOURCE%/*}/../common/linux/qnx_700.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/80-docker.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/80-docker.sh index 4a6681f3..82c2c659 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/80-docker.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/80-docker.sh @@ -1,4 +1,4 @@ #!/bin/bash BASEDIR=$(dirname "$0") -$BASEDIR/../common/linux/docker.sh +"$BASEDIR/../common/linux/docker.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/90-squish.sh index 27ff15c3..e4281588 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/90-squish.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/90-squish.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash BASEDIR=$(dirname "$0") -$BASEDIR/../common/unix/squishInstall.sh +"$BASEDIR/../common/unix/squishInstall.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh index 1d567a3e..dae1a58e 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh @@ -168,7 +168,7 @@ waitLoop sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}" # Install all needed packages in a special wheel cache directory -pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt +pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh index e3faa20e..4ca84072 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh @@ -34,6 +34,7 @@ set -ex +# shellcheck source=../common/unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" # build latest qemu to usermode diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh index fbe669d9..1c856c0c 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh @@ -37,7 +37,9 @@ set -ex +# shellcheck source=../common/unix/DownloadURL.sh source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" +# shellcheck source=../common/unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" echo "Installing Yocto toolchain for 32-bit b2qt..." @@ -76,7 +78,7 @@ chmod +x "$yoctoInstaller" /bin/bash "$yoctoInstaller" -y -d "$yoctoLocationARM64" rm -rf "$yoctoInstaller" -if [ -e "$yoctoLocationARMv7/$sysrootARMv7" -a -e "$yoctoLocationARMv7/${crosscompileARMv7}g++" -a -e "$yoctoLocationARM64/$sysrootARM64" -a -e "$yoctoLocationARM64/${crosscompileARM64}g++" ]; then +if [ -e "$yoctoLocationARMv7/$sysrootARMv7" ] && [ -e "$yoctoLocationARMv7/${crosscompileARMv7}g++" ] && [ -e "$yoctoLocationARM64/$sysrootARM64" ] && [ -e "$yoctoLocationARM64/${crosscompileARM64}g++" ]; then SetEnvVar "QEMUARMV7_TOOLCHAIN_SYSROOT" "$yoctoLocationARMv7/$sysrootARMv7" SetEnvVar "QEMUARMV7_TOOLCHAIN_CROSS_COMPILE" "$yoctoLocationARMv7/$crosscompileARMv7" SetEnvVar "QEMUARM64_TOOLCHAIN_SYSROOT" "$yoctoLocationARM64/$sysrootARM64" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto_ssh_configurations.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto_ssh_configurations.sh index e4d988fc..a6aa3b10 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto_ssh_configurations.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto_ssh_configurations.sh @@ -35,6 +35,7 @@ set -ex +# shellcheck source=../common/unix/DownloadURL.sh source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" url="http://ci-files01-hki.intra.qt.io/input/semisecure/test_farm_id_rsa" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/10-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/10-openssl_for_android_linux.sh index 0f89e72c..81ea3b17 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/10-openssl_for_android_linux.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/10-openssl_for_android_linux.sh @@ -35,4 +35,5 @@ set -ex +# shellcheck source=../common/linux/openssl_for_android_linux.sh source "${BASH_SOURCE%/*}/../common/linux/openssl_for_android_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh index 4527e984..7c58c478 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh @@ -33,4 +33,7 @@ ## ############################################################################# +set -ex + +# shellcheck source=../common/unix/mqtt_broker.sh source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh index 1a185223..4dd1d40e 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh @@ -35,4 +35,5 @@ set -ex +# shellcheck source=../common/linux/qnx_660.sh source "${BASH_SOURCE%/*}/../common/linux/qnx_660.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh index 24ac2ac0..1d7a3968 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh @@ -35,4 +35,5 @@ set -ex +# shellcheck source=../common/linux/qnx_700.sh source "${BASH_SOURCE%/*}/../common/linux/qnx_700.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh index 4a6681f3..82c2c659 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh @@ -1,4 +1,4 @@ #!/bin/bash BASEDIR=$(dirname "$0") -$BASEDIR/../common/linux/docker.sh +"$BASEDIR/../common/linux/docker.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh index 43790efd..fcc7d31c 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh @@ -1,3 +1,4 @@ #!/bin/bash +# shellcheck source=../common/linux/squish-coco.sh source "${BASH_SOURCE%/*}/../common/linux/squish-coco.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh index b062800a..c8f3ac03 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh @@ -1,4 +1,4 @@ #!/bin/bash BASEDIR=$(dirname "$0") -$BASEDIR/../common/linux/ubuntu-version.sh +"$BASEDIR/../common/linux/ubuntu-version.sh" diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh index 208762d3..6c5d2a0f 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh @@ -12,7 +12,8 @@ sudo pkcon -y install python-devel python-virtualenv sudo pkcon -y install libpython3_4m1_0 python3-base python3 python3-pip python3-devel python3-virtualenv python3-wheel # Install all needed packages in a special wheel cache directory -pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt +pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" +# shellcheck source=../common/unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/55-emsdk.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/55-emsdk.sh index ecce5ae7..09a76778 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/55-emsdk.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/55-emsdk.sh @@ -35,4 +35,5 @@ set -ex +# shellcheck source=../common/linux/emsdk.sh source "${BASH_SOURCE%/*}/../common/linux/emsdk.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh index 32528873..3304cc3e 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh @@ -1,3 +1,5 @@ #!/usr/bin/env bash +set -ex -$(dirname $0)/../common/unix/disable-ntp_macos.sh +# shellcheck source=../common/unix/disable-ntp_macos.sh +source "${BASH_SOURCE%/*}/../common/unix/disable-ntp_macos.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/06-disable_spotlight.sh b/coin/provisioning/qtci-macos-10.12-x86_64/06-disable_spotlight.sh index d991e6c0..67e2c1f6 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/06-disable_spotlight.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/06-disable_spotlight.sh @@ -1,2 +1,5 @@ #!/usr/bin/env bash -$(dirname "$0")/../common/macos/disable_spotlight.sh +set -ex + +# shellcheck source=../common/macos/disable_spotlight.sh +source "${BASH_SOURCE%/*}/../common/macos/disable_spotlight.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh b/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh index 6d3a2bb5..6e47f6a5 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh @@ -39,7 +39,7 @@ set -ex -# shellcheck source=../common/macos/InstallPKGFromURL +# shellcheck source=../common/macos/InstallPKGFromURL.sh source "${BASH_SOURCE%/*}/../common/macos/InstallPKGFromURL.sh" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/XZ.pkg" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh b/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh index 8877c40b..dcfcb93b 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh @@ -1,3 +1,5 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/java.sh +"$BASEDIR/../common/macos/java.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh index f7aba0dc..1fa8b05d 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh @@ -35,6 +35,7 @@ set -ex +# shellcheck source=../common/macos/install-commandlinetools.sh source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" version="9.2" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh index e5dd1910..4f4d405e 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/cmake.sh +"$BASEDIR/../common/macos/cmake.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh index 0ead5a58..06e984ec 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/homebrew.sh +"$BASEDIR/../common/macos/homebrew.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh index ef65edad..7ebb8825 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash set -ex +# shellcheck source=../common/macos/python2.sh source "${BASH_SOURCE%/*}/../common/macos/python2.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh index 92b05bf3..eb2a4863 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash set -ex +# shellcheck source=../common/macos/python3.sh source "${BASH_SOURCE%/*}/../common/macos/python3.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/26-odbc.sh b/coin/provisioning/qtci-macos-10.12-x86_64/26-odbc.sh index 469901b5..2aedfe7b 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/26-odbc.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/26-odbc.sh @@ -4,4 +4,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/libiodbc.sh +"$BASEDIR/../common/macos/libiodbc.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh b/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh index a35d26ca..eaabce82 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/virtualenv.sh +"$BASEDIR/../common/macos/virtualenv.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh b/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh index d68bf90a..33795b08 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh @@ -4,4 +4,4 @@ set -ex BASEDIR=$(dirname "$0") # There is only one mac package -$BASEDIR/../common/unix/libclang.sh +"$BASEDIR/../common/unix/libclang.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh b/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh index 9ce5d9ff..34eefeb6 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh @@ -3,5 +3,5 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/fbx_macos.sh +"$BASEDIR/../common/macos/fbx_macos.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh index 36bcf53c..963f48d6 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh @@ -2,4 +2,5 @@ set -ex +# shellcheck source=../common/macos/install_openssl.sh source "${BASH_SOURCE%/*}/../common/macos/install_openssl.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh index e1a41835..5bc77ad3 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh @@ -62,7 +62,7 @@ Install "$cache/semisecure/.qt-license" "$targetFolder/.qt-license" $sha1QtLicen # Login keychain sha1LoginKeychainPassword="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" Install "$cacheSigningTools/login_keychain_password.txt" "$targetFolder/login_keychain_password.txt" "$sha1LoginKeychainPassword" -loginKeychainPassword=$(<"$targetFolder/login_keychain_password.txt") +loginKeychainPassword=$(cat "$targetFolder/login_keychain_password.txt") loginKeychain=$keychains/login.keychain echo "Setting login.keychain as default keychain.." @@ -104,7 +104,7 @@ open "$keychains/$devIDKeychain" sha1DeveloperIDTheQtCompanyKeychainPassword="d758e067736bbda7a91ffaec66cd38afdaf68ea6" Install "$cacheSigningTools/Developer_ID_TheQtCompany_keychain_password.txt" "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt" "$sha1DeveloperIDTheQtCompanyKeychainPassword" -DeveloperIDTheQtCompanyKeychainPassword=$(<"$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt") +DeveloperIDTheQtCompanyKeychainPassword=$(cat "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt") echo "Unlocking $devIDKeychain with password.." security unlock-keychain -p "$DeveloperIDTheQtCompanyKeychainPassword" $keychains/Developer_ID_TheQtCompany.keychain @@ -112,19 +112,19 @@ security set-keychain-settings $keychains/Developer_ID_TheQtCompany.keychain sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios -iosPassword=$(<"$targetFolder/ios_password.txt") +iosPassword=$(cat "$targetFolder/ios_password.txt") iPhoneDeveloper="iosdevelopment.p12" shaIPhoneDeveloper="f48f6827e8d0ccdc764cb987e401b9a6f7d3f10c" Install "$cacheSigningTools/latest_ios_cert/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper echo "Importing $iPhoneDeveloper.." -security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign +security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign iPhoneDistribution="iosdistribution.p12" shaIPhoneDistribution="64b1174fc3ce0eca044fbc9fa144f6a2d4330171" Install "$cacheSigningTools/latest_ios_cert/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution echo "Importing $iPhoneDistribution.." -security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign +security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign # Mobileprovision echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.." diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/90-squish.sh b/coin/provisioning/qtci-macos-10.12-x86_64/90-squish.sh index 27ff15c3..17a0c38e 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/90-squish.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/90-squish.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") -$BASEDIR/../common/unix/squishInstall.sh +"$BASEDIR/../common/unix/squishInstall.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-macos-10.13-x86_64/02-disable-ntp.sh index 32528873..64d43d83 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/02-disable-ntp.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/02-disable-ntp.sh @@ -1,3 +1,4 @@ #!/usr/bin/env bash -$(dirname $0)/../common/unix/disable-ntp_macos.sh +# shellcheck source=../common/unix/disable-ntp_macos.sh +source "${BASH_SOURCE%/*}/../common/unix/disable-ntp_macos.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/06-disable_spotlight.sh b/coin/provisioning/qtci-macos-10.13-x86_64/06-disable_spotlight.sh index d991e6c0..67e2c1f6 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/06-disable_spotlight.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/06-disable_spotlight.sh @@ -1,2 +1,5 @@ #!/usr/bin/env bash -$(dirname "$0")/../common/macos/disable_spotlight.sh +set -ex + +# shellcheck source=../common/macos/disable_spotlight.sh +source "${BASH_SOURCE%/*}/../common/macos/disable_spotlight.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/15-xz.sh b/coin/provisioning/qtci-macos-10.13-x86_64/15-xz.sh index 06437ee1..9a667c64 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/15-xz.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/15-xz.sh @@ -39,7 +39,7 @@ set -ex -# shellcheck source=../common/macos/InstallPKGFromURL +# shellcheck source=../common/macos/InstallPKGFromURL.sh source "${BASH_SOURCE%/*}/../common/macos/InstallPKGFromURL.sh" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/XZ.pkg" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/20-java.sh b/coin/provisioning/qtci-macos-10.13-x86_64/20-java.sh index 8877c40b..dcfcb93b 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/20-java.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/20-java.sh @@ -1,3 +1,5 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/java.sh +"$BASEDIR/../common/macos/java.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh index f7c251b1..d4708031 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh @@ -35,6 +35,7 @@ set -ex +# shellcheck source=../common/macos/install-commandlinetools.sh source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" version="10.1" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh b/coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh index e5dd1910..4f4d405e 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/cmake.sh +"$BASEDIR/../common/macos/cmake.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh b/coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh index 0ead5a58..06e984ec 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/homebrew.sh +"$BASEDIR/../common/macos/homebrew.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-pip.sh b/coin/provisioning/qtci-macos-10.13-x86_64/25-pip.sh index 69c6b318..86db3e27 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/25-pip.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/25-pip.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/pip.sh +"$BASEDIR/../common/macos/pip.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-python2.sh b/coin/provisioning/qtci-macos-10.13-x86_64/25-python2.sh index ef65edad..7ebb8825 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/25-python2.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/25-python2.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash set -ex +# shellcheck source=../common/macos/python2.sh source "${BASH_SOURCE%/*}/../common/macos/python2.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-python3.sh b/coin/provisioning/qtci-macos-10.13-x86_64/25-python3.sh index 92b05bf3..eb2a4863 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/25-python3.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/25-python3.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash set -ex +# shellcheck source=../common/macos/python3.sh source "${BASH_SOURCE%/*}/../common/macos/python3.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/26-odbc.sh b/coin/provisioning/qtci-macos-10.13-x86_64/26-odbc.sh index 469901b5..2aedfe7b 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/26-odbc.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/26-odbc.sh @@ -4,4 +4,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/libiodbc.sh +"$BASEDIR/../common/macos/libiodbc.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/26-virtualenv.sh b/coin/provisioning/qtci-macos-10.13-x86_64/26-virtualenv.sh index a35d26ca..eaabce82 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/26-virtualenv.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/26-virtualenv.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/virtualenv.sh +"$BASEDIR/../common/macos/virtualenv.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/27-libclang.sh b/coin/provisioning/qtci-macos-10.13-x86_64/27-libclang.sh index fea11e01..aad628cb 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/27-libclang.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/27-libclang.sh @@ -4,4 +4,4 @@ set -ex BASEDIR=$(dirname "$0") # There is only one mac package and common script uses it as a default -$BASEDIR/../common/unix/libclang.sh +"$BASEDIR/../common/unix/libclang.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh index 9d7467ef..c0d75ff6 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh @@ -57,12 +57,7 @@ sdkBuildToolsVersion="28.0.3" # this is compile sdk version sdkApiLevel="android-28" -toolsSha1="ed85ea7b59bc3483ce0af4c198523ba044e083ad" -ndkSha1="98cb9909aa8c2dab32db188bbdc3ac6207e09440" - -toolsTargetFile="/tmp/$toolsFile" toolsSourceFile="$basePath/$toolsFile" -ndkTargetFile="/tmp/$ndkFile" ndkSourceFile="$basePath/$ndkFile" echo "Unzipping Android NDK to '$targetFolder'" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/30-fbx.sh b/coin/provisioning/qtci-macos-10.13-x86_64/30-fbx.sh index 9ce5d9ff..34eefeb6 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/30-fbx.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/30-fbx.sh @@ -3,5 +3,5 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/fbx_macos.sh +"$BASEDIR/../common/macos/fbx_macos.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh index 36bcf53c..963f48d6 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh @@ -2,4 +2,5 @@ set -ex +# shellcheck source=../common/macos/install_openssl.sh source "${BASH_SOURCE%/*}/../common/macos/install_openssl.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh b/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh index d9caff91..0b8595a0 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh @@ -62,7 +62,7 @@ Install "$cache/semisecure/.qt-license" "$targetFolder/.qt-license" $sha1QtLicen # Login keychain sha1LoginKeychainPassword="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" Install "$cacheSigningTools/login_keychain_password.txt" "$targetFolder/login_keychain_password.txt" "$sha1LoginKeychainPassword" -{ loginKeychainPassword=$(<"$targetFolder/login_keychain_password.txt"); } 2> /dev/null +{ loginKeychainPassword=$(cat "$targetFolder/login_keychain_password.txt"); } 2> /dev/null loginKeychain=$keychains/login.keychain echo "Setting login.keychain as default keychain.." @@ -104,7 +104,7 @@ open "$keychains/$devIDKeychain" sha1DeveloperIDTheQtCompanyKeychainPassword="d758e067736bbda7a91ffaec66cd38afdaf68ea6" Install "$cacheSigningTools/Developer_ID_TheQtCompany_keychain_password.txt" "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt" "$sha1DeveloperIDTheQtCompanyKeychainPassword" -{ DeveloperIDTheQtCompanyKeychainPassword=$(<"$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt"); } 2> /dev/null +{ DeveloperIDTheQtCompanyKeychainPassword=$(cat "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt"); } 2> /dev/null echo "Unlocking $devIDKeychain with password.." { security unlock-keychain -p "$DeveloperIDTheQtCompanyKeychainPassword" $keychains/Developer_ID_TheQtCompany.keychain; } 2> /dev/null @@ -112,19 +112,19 @@ security set-keychain-settings $keychains/Developer_ID_TheQtCompany.keychain sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" { Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios; } 2> /dev/null -{ iosPassword=$(<"$targetFolder/ios_password.txt"); } 2> /dev/null +{ iosPassword=$(cat "$targetFolder/ios_password.txt"); } 2> /dev/null iPhoneDeveloper="iosdevelopment_2019.p12" shaIPhoneDeveloper="fbc89661c5295b4105f3890989a94c559ea4a61c" Install "$cacheSigningTools/latest_ios_cert/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper echo "Importing $iPhoneDeveloper.." -{ security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign; } 2> /dev/null +{ security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null iPhoneDistribution="iosdistribution_2019.p12" shaIPhoneDistribution="f306102f9e18e2074a7b655a9b151ce69c95baac" Install "$cacheSigningTools/latest_ios_cert/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution echo "Importing $iPhoneDistribution.." -{ security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign; } 2> /dev/null +{ security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null # Mobileprovision echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.." diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/90-squish.sh b/coin/provisioning/qtci-macos-10.13-x86_64/90-squish.sh index 27ff15c3..17a0c38e 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/90-squish.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/90-squish.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") -$BASEDIR/../common/unix/squishInstall.sh +"$BASEDIR/../common/unix/squishInstall.sh" -- cgit v1.2.3 From c654e63c87d83577116431e165115e0c6ceb723d Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 7 Sep 2018 09:17:02 +0300 Subject: Update Windows 10, MSVC 2015 and MSVC 2017 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Windows 10 updated to build 1809 msvc2015 update 3 14.0.25431.01 msvc2015 update 3 (KB3165756) msvc2017 5.18.2 4.7.03056 ms-zune is no longer available in the latest Windows 10 version dotnet and msvc 2015 update patch installation moved to pre-provisioning. Msvc 2015 update patch installation seems to be flaky with this windows version. Task-number: QTBUG-68190 Task-number: QTQAINFRA-2255 Task-number: QTBUG-71125 Change-Id: I87defffa488cb75f7de0909020073b35476bea80 Reviewed-by: Tony Sarajärvi --- .../common/windows/msvc_2015_update3_patch.ps1 | 67 ---------------------- .../01-enable-dotnet-framework.ps1 | 22 ------- .../qtci-windows-10-x86_64/01-remove-ms-zune.ps1 | 2 - .../qtci-windows-10-x86_64/05-msvc.ps1 | 4 +- .../10-msvc_2015_update3_patch.ps1 | 34 ----------- 5 files changed, 2 insertions(+), 127 deletions(-) delete mode 100644 coin/provisioning/common/windows/msvc_2015_update3_patch.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/01-remove-ms-zune.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1 (limited to 'coin/provisioning') diff --git a/coin/provisioning/common/windows/msvc_2015_update3_patch.ps1 b/coin/provisioning/common/windows/msvc_2015_update3_patch.ps1 deleted file mode 100644 index bfbb397a..00000000 --- a/coin/provisioning/common/windows/msvc_2015_update3_patch.ps1 +++ /dev/null @@ -1,67 +0,0 @@ -############################################################################# -## -## Copyright (C) 2017 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$ -## -############################################################################# -. "$PSScriptRoot\helpers.ps1" - -# Install Cumulative Servicing Release Visual Studio 2015 update 3 -# Original download page: https://msdn.microsoft.com/en-us/library/mt752379.aspx - -$version = "2015 update3 (KB3165756)" -$packagePath = "C:\Windows\Temp" -$package = $packagePath + "\vs14-kb3165756.exe" -$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/vs14-kb3165756.exe" -$url_official = "http://go.microsoft.com/fwlink/?LinkID=816878" -$sha1 = "6a21d9b291ca75d44baad95e278fdc0d05d84c02" -$preparedPackage = "\\ci-files01-hki.intra.qt.io\provisioning\windows\vs14-kb3165756-update" - -if (Test-Path $preparedPackage) { - # The prepared package contains updated packages so that not everything has to be downloaded - Write-Host "Using prepared package" - Copy-Item -Recurse $preparedPackage $packagePath - # Remove the whole downloaded folder - $toRemove = $packagePath + "\vs14-kb3165756-update" - $executable = "$toRemove\vs14-kb3165756.exe" -} else { - Write-Host "Fetching patch for Visual Studio $version..." - Download $url_official $url_cache $package - $executable = $package - # Remove the downloaded executable - $toRemove = $executable -} - -Verify-Checksum $executable $sha1 -Write-Host "Installing patch for Visual Studio $version..." -Run-Executable $executable "/norestart /passive" - -Remove-Item -Force -Recurse -Path $toRemove - -Write-Output "Visual Studio = $version" >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1 deleted file mode 100644 index e7f4c248..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1 +++ /dev/null @@ -1,22 +0,0 @@ -# The DirectX SDK installer requires .Net framework 3.5 which isn't installed -# by default - -$netFeature = "NetFx3" -try { - $netFeatureState = (Get-WindowsOptionalFeature -Online -FeatureName "$netFeature").State - if ($netFeatureState -eq "Enabled") { - Write-Host ".Net Framework is already installed" - exit 0 - } -} catch { - Write-Host "Could not find .Net Framework Windows feature." - exit 1 -} - -Write-Host "Installing .Net Framework client" -try { - Enable-WindowsOptionalFeature -Online -FeatureName "$netFeature" -All -NoRestart -} catch { - Write-Host "Could not install .Net framework" - exit 1 -} diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-remove-ms-zune.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-remove-ms-zune.ps1 deleted file mode 100644 index 6a398725..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/01-remove-ms-zune.ps1 +++ /dev/null @@ -1,2 +0,0 @@ -Remove-AppxPackage Microsoft.ZuneVideo_10.17092.13511.0_x64__8wekyb3d8bbwe -Remove-AppxPackage Microsoft.ZuneMusic_10.17083.18321.0_x64__8wekyb3d8bbwe diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 index d019fc92..72ac1ca7 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 @@ -34,10 +34,10 @@ # Visual Studios are pre-provisioned to tier1 images # MSVC 2015 Update 3 -Write-Output "Visual Studio 2015 = Version 14.0.25421.3 Update 3" >> ~\versions.txt +Write-Output "Visual Studio 2015 = Version 14.0.25431.01 Update 3" >> ~\versions.txt # MSVC 2017 -Write-Output "Visual Studio 2017 = Version 15.1 (26403.7)" >> ~\versions.txt +Write-Output "Visual Studio 2017 = Version 15.8.5" >> ~\versions.txt # MSVC 2017 Build Tools Write-Output "Visual Studio 2017 Build Tools = Version 15.1 (26403.7)" >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1 deleted file mode 100644 index fe1aec7d..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1 +++ /dev/null @@ -1,34 +0,0 @@ -############################################################################# -## -## Copyright (C) 2017 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$ -## -############################################################################# -. "$PSScriptRoot\..\common\windows\msvc_2015_update3_patch.ps1" - -- cgit v1.2.3 From 338fce191ac1e14b9365068021b4f7ec7ad50646 Mon Sep 17 00:00:00 2001 From: Ivan Donchevskii Date: Fri, 5 Apr 2019 10:12:36 +0200 Subject: Provisioning: Install i686 mingw on Windows 10 X64 Required to compile 32-bit binaries. Fixes: QTQAINFRA-2896 Change-Id: I91a43ecf6e2c97886429c34c79591999b908879f Reviewed-by: Heikki Halmet --- coin/provisioning/common/windows/install-mingw.ps1 | 5 +++-- .../qtci-windows-10-x86_64/09-install-mingw730.ps1 | 11 +++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/09-install-mingw730.ps1 (limited to 'coin/provisioning') diff --git a/coin/provisioning/common/windows/install-mingw.ps1 b/coin/provisioning/common/windows/install-mingw.ps1 index 8b7fe41d..bc05ba91 100644 --- a/coin/provisioning/common/windows/install-mingw.ps1 +++ b/coin/provisioning/common/windows/install-mingw.ps1 @@ -37,7 +37,8 @@ function InstallMinGW { Param ( [string] $release = $(BadParam("release file name")), - [string] $sha1 = $(BadParam("SHA1 checksum of the file")) + [string] $sha1 = $(BadParam("SHA1 checksum of the file")), + [string] $suffix = "" ) $arch, $version, $null, $threading, $ex_handling, $build_ver, $revision = $release.split('-') @@ -45,7 +46,7 @@ function InstallMinGW if ($arch -eq "i686") { $win_arch = "Win32" } elseif ($arch -eq "x86_64") { $win_arch = "Win64" } - $envvar = "MINGW$version" + $envvar = "MINGW$version$suffix" $envvar = $envvar -replace '["."]' $targetdir = "C:\$envvar" $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\" + $release + ".7z" diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw730.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw730.ps1 new file mode 100644 index 00000000..5401b36a --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw730.ps1 @@ -0,0 +1,11 @@ +. "$PSScriptRoot\..\common\windows\install-mingw.ps1" + +# This script will install MinGW 7.3.0 + +$release = "i686-7.3.0-release-posix-dwarf-rt_v5-rev0" +$sha1 = "96e11c754b379c093e1cb3133f71db5b9f3e0532" +$suffix = "_i686" + +InstallMinGW $release $sha1 $suffix + + -- cgit v1.2.3 From b3e35cbac501c749cd17a48c8fc85ef6f8acbba7 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 9 Apr 2019 09:13:26 +0300 Subject: Provisioning: Remove MSVC 2015 update 3 patch from provisioning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MSVC 2015 update 3 patch seems to be already pre-provisioned with MSVC 2015 update installation Task-number: QTQAINFRA-2899 Change-Id: I582c47e4b54303394805f205c4becf6a74e941ec Reviewed-by: Tony Sarajärvi --- .../10-msvc_2015_update3_patch.ps1 | 34 ---------------------- 1 file changed, 34 deletions(-) delete mode 100644 coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 (limited to 'coin/provisioning') diff --git a/coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 deleted file mode 100644 index fe1aec7d..00000000 --- a/coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 +++ /dev/null @@ -1,34 +0,0 @@ -############################################################################# -## -## Copyright (C) 2017 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$ -## -############################################################################# -. "$PSScriptRoot\..\common\windows\msvc_2015_update3_patch.ps1" - -- cgit v1.2.3 From 791ec923a799a7cdba0b926412aa9fedb4bdc983 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 26 Feb 2019 13:12:02 +0200 Subject: Provisioning: Echo Emscripten version information to versions.txt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I0ad9b2299805534d1f635fd89ac74d4feb8ce5c4 Reviewed-by: Juha Karjalainen Reviewed-by: Morten Johan Sørvig Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/linux/emsdk.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'coin/provisioning') diff --git a/coin/provisioning/common/linux/emsdk.sh b/coin/provisioning/common/linux/emsdk.sh index 284eb19d..55f5a8c9 100755 --- a/coin/provisioning/common/linux/emsdk.sh +++ b/coin/provisioning/common/linux/emsdk.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash ############################################################################# ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -76,3 +76,6 @@ EOM SetEnvVar "PATH" "\"$targetFolder/emscripten-llvm-e$version/:$targetFolder/node-v$version_node-linux-x64/bin:$targetFolder/emscripten-$version:\$PATH\"" SetEnvVar "EMSCRIPTEN" "$targetFolder/emscripten-$version" SetEnvVar "EM_CONFIG" "$targetFolder/.emscripten" + +echo "Emsdk = $version" >> ~/versions.txt +echo "Emsdk node = $version_node" >> ~/versions.txt -- cgit v1.2.3 From 48443b4b9a8009b51728e020454e189d8c995acf Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Mon, 8 Apr 2019 12:54:40 +0300 Subject: Provisioning: update python 2.7.14 to 2.7.16 Python 2.7.14 used tlsv1 which is no longer accepted by github thus needing update to newer version. Task-number: QTQAINFRA-2900 Change-Id: I4e0790854b7c0732e4064ad355d953eb7b71a2b9 Reviewed-by: Heikki Halmet --- coin/provisioning/common/macos/python2.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'coin/provisioning') diff --git a/coin/provisioning/common/macos/python2.sh b/coin/provisioning/common/macos/python2.sh index f4016f8d..4ab914de 100755 --- a/coin/provisioning/common/macos/python2.sh +++ b/coin/provisioning/common/macos/python2.sh @@ -42,9 +42,9 @@ 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-2.7.14-macosx10.6.pkg" -AltUrl="https://www.python.org/ftp/python/2.7.14/python-2.7.14-macosx10.6.pkg" -SHA1="fa2bb77243ad0cb611aa3295204fab403bb0fa09" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-2.7.16-macosx10.6.pkg" +AltUrl="https://www.python.org/ftp/python/2.7.16/python-2.7.16-macosx10.6.pkg" +SHA1="895a8327a58e7c0e58852638ab3d84843643535b" DestDir="/" InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir" @@ -55,5 +55,5 @@ InstallPip python2.7 SetEnvVar "PATH" "/Library/Frameworks/Python.framework/Versions/2.7/bin/:\$PATH" -echo "python2 = 2.7.14" >> ~/versions.txt +echo "python2 = 2.7.16" >> ~/versions.txt -- cgit v1.2.3 From 577d01e9dfaa9e69608097c550bd1877b5a9b735 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 1 Apr 2019 11:48:52 +0200 Subject: Provisioning: disable docker test servers on Windows 10 (x86_64) This reverts commit 177df80f09f3a84af7d86390ae7160a64fad8b4c partially. Change-Id: I6c091ad48397ad221090274144ac88dfa47c0e0f Reviewed-by: Aapo Keskimolo --- coin/provisioning/common/windows/docker.ps1 | 85 ---------------------- .../qtci-windows-10-x86_64/95-docker.ps1 | 6 -- 2 files changed, 91 deletions(-) delete mode 100644 coin/provisioning/common/windows/docker.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/95-docker.ps1 (limited to 'coin/provisioning') diff --git a/coin/provisioning/common/windows/docker.ps1 b/coin/provisioning/common/windows/docker.ps1 deleted file mode 100644 index 6f53eccd..00000000 --- a/coin/provisioning/common/windows/docker.ps1 +++ /dev/null @@ -1,85 +0,0 @@ -############################################################################# -## -## Copyright (C) 2019 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$ -## -############################################################################# - -. "$PSScriptRoot\helpers.ps1" - -# This script installs Docker tool kits and Apple Bonjour on Windows. - -function DownloadAndInstall -{ - Param ( - [string]$externalUrl, - [string]$internalUrl, - [string]$package, - [string]$sha1, - [string]$parameters - ) - - Write-Host "Fetching $package from URL..." - Download $externalUrl $internalUrl $package - Verify-Checksum $package $sha1 - - Write-Host "Installing $package..." - Run-Executable $package $parameters - - Write-Host "Remove $package..." - Remove-Item -Path $package -} - -# Install Docker Toolbox -$package = Get-DownloadLocation "DockerToolbox.exe" -$externalUrl = "https://download.docker.com/win/stable/DockerToolbox.exe" -$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/DockerToolbox.exe" -$sha1 = "62325c426ff321d9ebfb89664d65cf9ffaef2985" -DownloadAndInstall $externalUrl $internalUrl $package $sha1 "/SP- /SILENT" -Add-Path 'C:\Program Files\Docker Toolbox' -docker --version -docker-compose --version - -# Install Apple Bonjour -$package = Get-DownloadLocation "BonjourPSSetup.exe" -$externalUrl = "http://support.apple.com/downloads/DL999/en_US/BonjourPSSetup.exe" -$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/BonjourPSSetup.exe" -$sha1 = "847f39e0ea80d2a4d902fe59657e18f5bc32a8cb" -DownloadAndInstall $externalUrl $internalUrl $package $sha1 "/qr" - -# Nested virtualization - Print CPU features to verify that CI has enabled VT-X/AMD-v support -$testserver = "$PSScriptRoot\..\shared\testserver\docker_testserver.sh" -$sysInfoStr = systeminfo -if ($sysInfoStr -like "*A hypervisor has been detected*") { - & 'C:\Program Files\Git\bin\bash.exe' --login $testserver Hyper-V -} elseif ($sysInfoStr -like "*Virtualization Enabled In Firmware: Yes*") { - & 'C:\Program Files\Git\bin\bash.exe' --login $testserver VMX -} else { - Write-Error "VMX not found error! Please make sure Coin has enabled VT-X/AMD-v." -} diff --git a/coin/provisioning/qtci-windows-10-x86_64/95-docker.ps1 b/coin/provisioning/qtci-windows-10-x86_64/95-docker.ps1 deleted file mode 100644 index df735855..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/95-docker.ps1 +++ /dev/null @@ -1,6 +0,0 @@ -# Disable Hyper-V from Windows 10 Pro/Enterprise -# Because VirtualBox is a type 2 hypervisor, it can't run if Hyper-V virtual machines are in use. -# Otherwise, docker-machine will complain about "VT-x is not available (VERR_VMX_NO_VMX)". -Disable-WindowsOptionalFeature -Online -FeatureName Microsoft-Hyper-V-All -NoRestart - -. "$PSScriptRoot\..\common\windows\docker.ps1" -- cgit v1.2.3