lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-23 06:41:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix broken and duplicate Ruby provisioning

Browse Source 
Ruby is being installed twice on certain Windows platforms and the 32
bit versions of these don't have a working PATH addition.

Task-number: QTQAINFRA-1632
Change-Id: Id7fd269854d17c32df7d0b82ac9e750e645af564
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
This commit is contained in:
Joni Jantti
2017-12-07 12:52:19 +02:00
committed by Konstantin Tokarev
parent 0565e759c5
commit 1dee4e9fca
8 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
coin/provisioning/common/install-ruby.ps1
View File

@@ -35,26 +35,24 @@
# This script will install Ruby
$version = "2.2.6"
$version = "2.4.2-2"
if( (is64bitWinHost) -eq 1 ) {
$arch = "-x64"
$sha1 = "4D0E366F0264CDED174E5842B2435E22B81FB57A"
$sha1 = "c961c2752a183487bc42ed24beb7e931230fa7d5"
}
else {
$arch = ""
$sha1 = "8649309fffe9c746ad5549d3f7b70490806e95df"
$arch = "-x86"
$sha1 = "2639a481c3b5ad11f57d5523cc41ca884286089e"
}
$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\rubyinstaller-" + $version + $arch + ".exe"
$url_official = "https://bintray.com/oneclick/rubyinstaller/download_file?file_path=rubyinstaller-" + $version + $arch + ".exe"
$url_official = "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-" + $version + "/rubyinstaller-" + $version + $arch + ".exe"
$rubyPackage = "C:\Windows\Temp\rubyinstaller-$version.exe"
Download $url_official $url_cache $rubyPackage
Verify-Checksum $rubyPackage $sha1
cmd /c "$rubyPackage /silent"
Start-Process -FilePath $rubyPackage -ArgumentList "/dir=C:\Ruby-$version$arch /tasks=modpath /verysilent" -Wait
echo "Cleaning $rubyPackage.."
Remove-Item -Recurse -Force "$rubyPackage"
Add-Path "C:\Ruby22-x64\bin"
echo "Ruby = $version" >> ~\versions.txt