summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuha Karjalainen <juha.karjalainen@qt.io>2019-01-22 11:54:55 +0200
committerJuha Karjalainen <juha.karjalainen@qt.io>2019-02-12 09:10:50 +0000
commit80deae9b74d1cfc0717767c882f654be8ae67b05 (patch)
treebc15fa3ea1271248b29c902a14e60d6bafe0d1a3
parent2dff8afa987117b703bc0f9423f7227c0853e22e (diff)
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 <heikki.halmet@qt.io>
-rw-r--r--coin/provisioning/common/windows/dxsdk.ps114
1 files changed, 7 insertions, 7 deletions
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