diff options
Diffstat (limited to 'coin/provisioning/common')
-rwxr-xr-x | coin/provisioning/common/linux/openssl_for_android_linux.sh | 4 | ||||
-rwxr-xr-x | coin/provisioning/common/macos/install_xcode.sh | 12 | ||||
-rwxr-xr-x | coin/provisioning/common/macos/nodejs.sh | 50 | ||||
-rwxr-xr-x | coin/provisioning/common/macos/pip.sh | 9 | ||||
-rwxr-xr-x | coin/provisioning/common/unix/install-openssl.sh | 6 | ||||
-rwxr-xr-x | coin/provisioning/common/unix/squishInstall.sh | 46 | ||||
-rw-r--r-- | coin/provisioning/common/windows/android-openssl.ps1 | 62 | ||||
-rw-r--r-- | coin/provisioning/common/windows/conan.ps1 | 79 | ||||
-rw-r--r-- | coin/provisioning/common/windows/openssl.ps1 | 8 | ||||
-rw-r--r-- | coin/provisioning/common/windows/squishInstall.ps1 | 19 | ||||
-rw-r--r-- | coin/provisioning/common/windows/update-msvc2019.ps1 | 12 |
11 files changed, 174 insertions, 133 deletions
diff --git a/coin/provisioning/common/linux/openssl_for_android_linux.sh b/coin/provisioning/common/linux/openssl_for_android_linux.sh index 65e3b022..29ed82f8 100755 --- a/coin/provisioning/common/linux/openssl_for_android_linux.sh +++ b/coin/provisioning/common/linux/openssl_for_android_linux.sh @@ -41,6 +41,7 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" +version="1.1.1k" exports_file="/tmp/export.sh" # source previously made environmental variables. if uname -a |grep -q "Ubuntu"; then @@ -53,11 +54,10 @@ else rm -rf "$exports_file" fi -version="1.1.1g" officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz" cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz" targetFile="/tmp/openssl-$version.tar.gz" -sha="b213a293f2127ec3e323fb3cfc0c9807664fd997" +sha="bad9dc4ae6dcc1855085463099b5dacb0ec6130b" opensslHome="${HOME}/openssl/android/openssl-${version}" DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile" mkdir -p "${HOME}/openssl/android/" diff --git a/coin/provisioning/common/macos/install_xcode.sh b/coin/provisioning/common/macos/install_xcode.sh index 61326666..c1f8f971 100755 --- a/coin/provisioning/common/macos/install_xcode.sh +++ b/coin/provisioning/common/macos/install_xcode.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -33,6 +33,9 @@ ## ############################################################################# +# shellcheck source=./../unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" + # This script installs Xcode # Prerequisites: Have Xcode prefetched to local cache as xz compressed. # This can be achieved by fetching Xcode_8.xip from Apple Store. @@ -52,7 +55,12 @@ function InstallXCode() { if [[ $sourceFile =~ tar ]]; then cd /Applications/ && sudo tar -zxf "$sourceFile" elif [[ $sourceFile =~ "xip" ]]; then - cd /Applications/ && xip -x "$sourceFile" + if [[ $sourceFile =~ "http" ]]; then + Download $sourceFile /Applications/Xcode_$version.xip + cd /Applications/ && xip -x "Xcode_$version.xip" + else + cd /Applications/ && xip -x "$sourceFile" + fi else xzcat < "$sourceFile" | (cd /Applications/ && sudo cpio -dmi) fi diff --git a/coin/provisioning/common/macos/nodejs.sh b/coin/provisioning/common/macos/nodejs.sh new file mode 100755 index 00000000..1313d27e --- /dev/null +++ b/coin/provisioning/common/macos/nodejs.sh @@ -0,0 +1,50 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2021 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# shellcheck source=./../unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" + +# This script will install Nodejs + +version="14.16.1" +urlCache="http://ci-files01-hki.ci.local/input/nodejs/node-v$version.pkg" +urlOffcial="https://nodejs.org/dist/v$version/node-v$version.pkg" +sha1="4720274971c40fe51b2c647060f77c45fb4949a7" + +DownloadURL $urlCache $urlOffcial $sha1 "/tmp/node-v$version.pkg" +sudo installer -pkg "/tmp/node-v$version.pkg" -target / + + echo "Nodejs = $version" >> ~/versions.txt + diff --git a/coin/provisioning/common/macos/pip.sh b/coin/provisioning/common/macos/pip.sh index 2d07db85..b1c9a864 100755 --- a/coin/provisioning/common/macos/pip.sh +++ b/coin/provisioning/common/macos/pip.sh @@ -1,11 +1,18 @@ #!/usr/bin/env bash +# shellcheck source=../unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" + function InstallPip { python=$1 # Will install pip utility for python - curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py + if [[ $python == "python2.7" ]]; then + DownloadURL "http://ci-files01-hki.intra.qt.io/input/mac/python27/get-pip.py" "https://bootstrap.pypa.io/2.7/get-pip.py" "c4c5f74586cffe49804f167d95d1710b9750ddf0" + else + DownloadURL "http://ci-files01-hki.intra.qt.io/input/mac/get-pip.py" "https://bootstrap.pypa.io/get-pip.py" "209ddf0bb8d1cf06a1f17dd9f21970c76b3d2be2" + fi sudo "$python" get-pip.py rm get-pip.py } diff --git a/coin/provisioning/common/unix/install-openssl.sh b/coin/provisioning/common/unix/install-openssl.sh index 75b7edbc..df82beeb 100755 --- a/coin/provisioning/common/unix/install-openssl.sh +++ b/coin/provisioning/common/unix/install-openssl.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2020 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="1.1.1g" +version="1.1.1k" officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz" cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz" targetFile="/tmp/openssl-$version.tar.gz" -sha="b213a293f2127ec3e323fb3cfc0c9807664fd997" +sha="bad9dc4ae6dcc1855085463099b5dacb0ec6130b" opensslHome="${HOME}/openssl-${version}" opensslSource="${opensslHome}-src" DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile" diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index bce68549..4e7a5dca 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -41,19 +41,23 @@ set -ex # This script will fetch and extract pre-buildt squish package for Linux and Mac. # Squish is need by Release Test Automation (RTA) -version="6.6.1" -qtBranch="515x" +version="6.7-20210318-1241" +qtBranch="60x" installFolder="/opt" squishFolder="$installFolder/squish" preBuildCacheUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/jenkins_build/stable" -licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/$qtBranch/.squish-3-license" +licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/515x/.squish-3-license" licenseSHA="e000d2f95b30b82f405b9dcbeb233cd43710a41a" if uname -a |grep -q Darwin; then - compressedFolder="prebuild-squish-$version-$qtBranch-macx86_64.tar.gz" - sha1="9fff9a7cb037214d21f47f2cc53747885fd1f2ae" + #macOS package had to redo, so it's having same filename but different location to + #keep previous provisioning in working state + preBuildCacheUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/jenkins_build/stable/6.7_rerun" + version="6.7-20210301-1401" + compressedFolder="prebuild-squish-$version-$qtBranch-macx86_64.tar.gz" + sha1="e82701ffc1eb465dce3163ce7eab9ccaedc568c1" else compressedFolder="prebuild-squish-$version-$qtBranch-linux64.tar.gz" - sha1="3a50052caafa3ca583b7edf754227999d7185ffa" + sha1="80b3f36e760963a6989a49c79818bf8671d1932a" fi mountFolder="/tmp/squish" @@ -96,7 +100,8 @@ sudo mv "$installFolder/rta_squish_$version" "$squishFolder" if uname -a |grep -q "Ubuntu"; then if [ ! -e "/usr/lib/tcl8.6" ]; then sudo mkdir /usr/lib/tcl8.6 - sudo cp "$squishFolder/squish_for_qt/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/ + #this needs to be copied only to squish_for_qt6 + sudo cp "$squishFolder/squish_for_qt6/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/ fi fi @@ -108,18 +113,27 @@ sudo chown qt:$usersGroup "$HOME/.squish-3-license" echo "Set commands for environment variables in .bashrc" if uname -a |grep -q "Ubuntu"; then - echo "export SQUISH_PATH=$squishFolder/squish_for_qt" >> ~/.profile - echo "export PATH=\$PATH:$squishFolder/squish_for_qt/bin" >> ~/.profile + echo "export SQUISH_PATH=$squishFolder/squish_for_qt6" >> ~/.profile + echo "export PATH=\$PATH:$squishFolder/squish_for_qt6/bin" >> ~/.profile else - echo "export SQUISH_PATH=$squishFolder/squish_for_qt" >> ~/.bashrc - echo "export PATH=\$PATH:$squishFolder/squish_for_qt/bin" >> ~/.bashrc + echo "export SQUISH_PATH=$squishFolder/squish_for_qt6" >> ~/.bashrc + echo "export PATH=\$PATH:$squishFolder/squish_for_qt6/bin" >> ~/.bashrc fi -echo "Verifying Squish" -if "$squishFolder/squish_for_qt/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then - echo "Squish for Qt installation tested successfully" +echo "Verifying Squish, available installations:" +ls -la $squishFolder + +if "$squishFolder/squish_for_qt5/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then + echo "Squish for Qt5 installation tested successfully" +else + echo "Squish for Qt5 test failed! Package wasn't installed correctly." + exit 1 +fi +if "$squishFolder/squish_for_qt6/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then + echo "Squish for Qt6 installation tested successfully" else - echo "Squish for Qt test failed! Package wasn't installed correctly." - exit 1 + echo "Squish for Qt6 test failed! Package wasn't installed correctly." + exit 1 fi + diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index acb68a3b..d2fa74f2 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2020 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -45,47 +45,57 @@ if (Is64BitWinHost) { # Msys need to be installed to target machine # More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html -$version = "1.1.1g" +$version = "1.1.1k" $zip = Get-DownloadLocation ("openssl-$version.tar.gz") -$sha1 = "b213a293f2127ec3e323fb3cfc0c9807664fd997" +$prebuilt_zip = Get-DownloadLocation ("openssl-android-master-$version.zip") +$sha1 = "bad9dc4ae6dcc1855085463099b5dacb0ec6130b" +$prebuilt_sha1 = "07fad2a44ffa90261a779782bd64fe2304487945" $destination = "C:\Utils\openssl-android-master" +$prebuilt_url = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-android-master-$version.zip" # msys unix style paths $ndkPath = "/c/Utils/Android/android-ndk-r21d" $openssl_path = "/c/Utils/openssl-android-master" $cc_path = "$ndkPath/toolchains/llvm/prebuilt/windows-x86_64/bin" -Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip -Verify-Checksum $zip $sha1 +if ((Test-Path $prebuilt_url)) { + Download $prebuilt_url $prebuilt_url $prebuilt_zip + Verify-Checksum $prebuilt_zip $prebuilt_sha1 + Extract-7Zip $prebuilt_zip C:\Utils + Remove $prebuilt_zip +} else { + Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip + Verify-Checksum $zip $sha1 -Extract-7Zip $zip C:\Utils\tmp -Extract-7Zip C:\Utils\tmp\openssl-$version.tar C:\Utils\tmp -Move-Item C:\Utils\tmp\openssl-${version} $destination -Remove-Item -Path $zip + Extract-7Zip $zip C:\Utils\tmp + Extract-7Zip C:\Utils\tmp\openssl-$version.tar C:\Utils\tmp + Move-Item C:\Utils\tmp\openssl-${version} $destination + Remove "$zip" -Write-Host "Configuring OpenSSL $version for Android..." -Push-Location $destination -# $ must be escaped in powershell... + Write-Host "Configuring OpenSSL $version for Android..." + Push-Location $destination + # $ must be escaped in powershell... -function CheckExitCode { + function CheckExitCode { - param ( - $p - ) + param ( + $p + ) - if ($p.ExitCode) { - Write-host "Process failed with exit code: $($p.ExitCode)" - exit 1 + if ($p.ExitCode) { + Write-host "Process failed with exit code: $($p.ExitCode)" + exit 1 + } } -} -$configure = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang $openssl_path/Configure shared android-arm`"") -CheckExitCode $configure + $configure = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang $openssl_path/Configure shared android-arm`"") + CheckExitCode $configure -$make = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang make -f $openssl_path/Makefile build_generated`"") -CheckExitCode $make + $make = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang make -f $openssl_path/Makefile build_generated`"") + CheckExitCode $make -Pop-Location + Pop-Location + Remove-item C:\Utils\tmp -Recurse -Confirm:$false +} Set-EnvironmentVariable "OPENSSL_ANDROID_HOME" "$destination" -Remove-item C:\Utils\tmp -Recurse -Confirm:$false Write-Output "Android OpenSSL = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/conan.ps1 b/coin/provisioning/common/windows/conan.ps1 index 8b22ab1d..1e4f14e1 100644 --- a/coin/provisioning/common/windows/conan.ps1 +++ b/coin/provisioning/common/windows/conan.ps1 @@ -1,7 +1,6 @@ -############################################################################# +############################################################################ ## -## Copyright (C) 2019 The Qt Company Ltd. -## Copyright (C) 2019 Konstantin Tokarev <annulen@yandex.ru> +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -30,68 +29,26 @@ ## ## $QT_END_LICENSE$ ## -############################################################################# +############################################################################ . "$PSScriptRoot\helpers.ps1" -$scriptsPath = "C:\Python36\Scripts" +# This is temporary solution for installing packages provided by Conan until we have fixed Conan setup for this -Run-Executable "$scriptsPath\pip3.exe" "install -r $PSScriptRoot\conan_requirements.txt" -Write-Output "Conan = 1.29.0" >> ~\versions.txt +$url_conan = "\\ci-files01-hki.intra.qt.io\provisioning\windows\.conan.zip" +$url_conan_home = "\\ci-files01-hki.intra.qt.io\provisioning\windows\.conanhome.zip" +$sha1_conan_compressed = "1abbe43e7a29ddd9906328702b5bc5231deeb721" +$sha1_conanhome_compressed = "f44c2ae21cb1c7dc139572e399b7b0eaf492af03" +$conan_compressed = "C:\.conan.zip" +$conanhome_compressed = "C:\.conanhome.zip" -# Use Qt Project repository by default -Run-Executable "$scriptsPath\conan.exe" "remote add qtproject https://api.bintray.com/conan/qtproject/conan --insert --force" +Download $url_conan $url_conan $conan_compressed +Verify-Checksum $conan_compressed $sha1_conan_compressed +Extract-7Zip $conan_compressed C:\ -Set-EnvironmentVariable "CI_CONAN_BUILDINFO_DIR" "C:\Utils\conanbuildinfos" +Download $url_conan_home $url_conan_home $conanhome_compressed +Verify-Checksum $conanhome_compressed $sha1_conanhome_compressed +Extract-7Zip $conanhome_compressed C:\Users\qt -function Run-Conan-Install -{ - Param ( - [string]$ConanfilesDir, - [string]$BuildinfoDir, - [string]$Arch, - [string]$Compiler, - [string]$CompilerVersion, - [string]$CompilerRuntime, - [string]$CompilerLibcxx, - [string]$CompilerException, - [string]$CompilerThreads - ) - - if ($CompilerRuntime) { - $extraArgs += " -s compiler.runtime=$CompilerRuntime" - } - - if ($CompilerLibcxx) { - $extraArgs += " -s compiler.libcxx=$CompilerLibcxx" - } - - if ($CompilerException) { - $extraArgs += " -s compiler.exception=$CompilerException" - } - - if ($CompilerThreads) { - $extraArgs += " -s compiler.threads=$CompilerThreads" - } - - $manifestsDir = "$PSScriptRoot\conan_manifests" - $buildinfoRoot = "C:\Utils\conanbuildinfos" - - # Make up to 5 attempts for all download operations in conan - $env:CONAN_RETRY = "5" - - Get-ChildItem -Path "$ConanfilesDir\*.txt" | - ForEach-Object { - $conanfile = $_.FullName - $outpwd = "$buildinfoRoot\$BuildinfoDir\$($_.BaseName)" - New-Item $outpwd -Type directory -Force | Out-Null - - Push-Location $outpwd - Run-Executable "$scriptsPath\conan.exe" "install --no-imports --verify $manifestsDir", ` - '-s', ('compiler="' + $Compiler + '"'), ` - "-s os=Windows -s arch=$Arch -s compiler.version=$CompilerVersion $extraArgs $conanfile" - Pop-Location - - Copy-Item -Path $conanfile -Destination "$outpwd\conanfile.txt" - } -} +Remove $conan_compressed +Remove $conanhome_compressed diff --git a/coin/provisioning/common/windows/openssl.ps1 b/coin/provisioning/common/windows/openssl.ps1 index 08f7d60f..b7abf11c 100644 --- a/coin/provisioning/common/windows/openssl.ps1 +++ b/coin/provisioning/common/windows/openssl.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2020 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -36,7 +36,7 @@ # This script installs OpenSSL $version. # Both x86 and x64 versions needed when x86 integrations are done on x64 machine -$version = "1_1_1g" +$version = "1_1_1k" $packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe" $packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe" @@ -47,7 +47,7 @@ if (Is64BitWinHost) { $installFolder = "C:\openssl" $externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe" $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe" - $sha1 = "7643561c372720f55de51454a707ede334db086e" + $sha1 = "ab5367a1f46a3779a870fe2c1a99e03f8ffa3041" Write-Host "Fetching from URL ..." Download $externalUrl $internalUrl $packagex64 @@ -74,7 +74,7 @@ if (Is64BitWinHost) { $externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe" $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe" -$sha1 = "c7d4b096c2413d1af819ccb291214fa3c4cece07" +$sha1 = "49f5b7fe01d686f706071c9a00d19bd69f2e7371" Write-Host "Fetching from URL ..." Download $externalUrl $internalUrl $packagex86 diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index c615f9eb..2005864c 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -36,12 +36,12 @@ # This script will pre-installed squish package for Windows. # Squish is need by Release Test Automation (RTA) -$version = "6.6.1" -$qtBranch = "515x" +$version = "6.7-20210319-0956" +$qtBranch = "60x" $targetDir = "C:\Utils\squish" $squishPackage = "C:\Utils\rta_squish" $squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable" -$licenseUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin" +$licenseUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin\515x" # Squish license $licensePackage = ".squish-3-license" @@ -50,7 +50,7 @@ Write-Host "Installing Squish license to home directory" Copy-Item $licenseUrl\$licensePackage ~\$licensePackage if (Is64BitWinHost) { - $arch = "x64" + $arch = "x64" } else { $arch = "x86" } @@ -60,15 +60,10 @@ $OSVersion = (get-itemproperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\Curren if ($OSVersion -eq "Windows 10 Enterprise") { $winVersion = "win10" if (Is64BitWinHost) { - $sha1 = "17b5bec83f448877e42e5effdc7daf723d157800" - } else { - $sha1 = "9c0fc186605522ac0ac11066c10c3f3e8a95a705" - #Remove special handling when all packages are in same dir, exception now for win10 x86->the archive had to be rebuild - $squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable\6.6.1_rerun" + $sha1 = "61eca4950d24d9780e02cd4183c54009eda46114" } -} elseif ($OSVersion -eq "Windows 7 Enterprise") { - $winVersion = "win7" - $sha1 = "ec890c16bb671ae79b093ba81e6567d2780f85a2" +} else { + $winVersion = "n/a" } $squishArchive = "prebuild-squish-$version-$qtBranch-$winVersion-$arch.zip" diff --git a/coin/provisioning/common/windows/update-msvc2019.ps1 b/coin/provisioning/common/windows/update-msvc2019.ps1 index 0b0f384d..c53fac05 100644 --- a/coin/provisioning/common/windows/update-msvc2019.ps1 +++ b/coin/provisioning/common/windows/update-msvc2019.ps1 @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2020 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -37,13 +37,13 @@ # NOTE! Visual Studio is pre-installed to tier 1 image so this script won't install the whole Visual Studio. See ../../../pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt # MSVC 2019 online installers can be found from here https://docs.microsoft.com/en-us/visualstudio/releases/2019/history#installing-an-earlier-release -$version = "16_7_5" +$version = "16_9_4" $urlCache_vsInstaller = "\\ci-files01-hki.intra.qt.io\provisioning\windows\msvc\vs2019_Professional_$version.exe" -$urlOfficial_vsInstaller = "https://download.visualstudio.microsoft.com/download/pr/e8bc3741-cb70-42aa-9b4e-2bd497de85dd/74b4e599138d5b5824d87ee657b78cbdeb3716f58a9645047e53bb5f68131516/vs_Professional.exe" -$sha1_vsInstaller = "70062274c1ae79f5f0f7cb91192347abc1ebcb00" +$urlOfficial_vsInstaller = "https://download.visualstudio.microsoft.com/download/pr/3105fcfe-e771-41d6-9a1c-fc971e7d03a7/d60c42571053950bf742db19e30430f76354c95af06afb1364d5b2aab620f4e5/vs_Professional.exe" +$sha1_vsInstaller = "03e3896b790b1734434ab12c2e06ca458e67395f" $urlCache_buildToolsInstaller = "\\ci-files01-hki.intra.qt.io\provisioning\windows\msvc\vs2019_BuildTools_$version.exe" -$urlOfficial_buildToolsInstaller = "https://download.visualstudio.microsoft.com/download/pr/e8bc3741-cb70-42aa-9b4e-2bd497de85dd/f3713de3e01b7829d529f67d6240116b73cc0743974bb5373a052f9629cc24d2/vs_BuildTools.exe" -$sha1_buildToolsInstaller = "efb4600bf9bd09adf55a36e2e5d0d47a3abd481e" +$urlOfficial_buildToolsInstaller = "https://download.visualstudio.microsoft.com/download/pr/3105fcfe-e771-41d6-9a1c-fc971e7d03a7/e0c2f5b63918562fd959049e12dffe64bf46ec2e89f7cadde3214921777ce5c2/vs_BuildTools.exe" +$sha1_buildToolsInstaller = "59e62e552305e60420154395d79d5261d65f52dc" $installerPath = "C:\Windows\Temp\installer.exe" function Install { |