mirror of
git://code.qt.io/qt/qt5.git
synced 2026-05-10 04:58:08 +08:00
Update Ruby on Win10
QtWebKit requires newer Ruby than version installed on Windows 10 builders. Task-number: QTQAINFRA-997 Change-Id: Id4f917a824daaab4aeb1445a3a16906663208b6d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
@@ -29,3 +29,23 @@ function Extract-Zip
|
|||||||
$destinationFolder = $shell.Namespace($Destination)
|
$destinationFolder = $shell.Namespace($Destination)
|
||||||
$destinationFolder.CopyHere($zipfile.Items(), 16)
|
$destinationFolder.CopyHere($zipfile.Items(), 16)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function BadParam
|
||||||
|
{
|
||||||
|
Param ([string]$Description)
|
||||||
|
throw("You must specify $Description")
|
||||||
|
}
|
||||||
|
|
||||||
|
function Download
|
||||||
|
{
|
||||||
|
Param (
|
||||||
|
[string] $OfficialUrl = $(BadParam("the official download URL")),
|
||||||
|
[string] $CachedUrl = $(BadParam("the locally cached URL")),
|
||||||
|
[string] $Destination = $(BadParam("a download target location"))
|
||||||
|
)
|
||||||
|
try {
|
||||||
|
Invoke-WebRequest -UseBasicParsing $CachedUrl -OutFile $Destination
|
||||||
|
} catch {
|
||||||
|
Invoke-WebRequest -UseBasicParsing $OfficialUrl -OutFile $Destination
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
7
coin/provisioning/common/ruby.ps1
Normal file
7
coin/provisioning/common/ruby.ps1
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
. "$PSScriptRoot\helpers.ps1"
|
||||||
|
|
||||||
|
$installer = "c:\users\qt\downloads\rubyinstaller-2.3.1.exe"
|
||||||
|
|
||||||
|
Download https://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.3.1.exe http://ci-files01-hki.ci.local/input/ruby/rubyinstaller-2.3.1.exe $installer
|
||||||
|
Verify-Checksum $installer "FF377F6F313849C3B0CD72EEC1EFFA436F0E4A36"
|
||||||
|
& $installer /DIR=C:\ruby /VERYSILENT
|
||||||
1
coin/provisioning/qtci-windows-10-x86/ruby.ps1
Normal file
1
coin/provisioning/qtci-windows-10-x86/ruby.ps1
Normal file
@@ -0,0 +1 @@
|
|||||||
|
. "$PSScriptRoot\..\common\ruby.ps1"
|
||||||
1
coin/provisioning/qtci-windows-10-x86_64/ruby.ps1
Normal file
1
coin/provisioning/qtci-windows-10-x86_64/ruby.ps1
Normal file
@@ -0,0 +1 @@
|
|||||||
|
. "$PSScriptRoot\..\common\ruby.ps1"
|
||||||
Reference in New Issue
Block a user