diff options
Diffstat (limited to 'coin/provisioning')
-rw-r--r-- | coin/provisioning/common/install-ruby.ps1 | 14 | ||||
-rw-r--r-- | coin/provisioning/common/ruby.ps1 | 7 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps1 | 1 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86/ruby.ps1 | 1 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/ruby.ps1 | 1 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-7-x86/33-ruby.ps1 | 1 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-7-x86/ruby.ps1 | 1 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-7-x86_64/26-ruby.ps1 | 1 |
8 files changed, 7 insertions, 20 deletions
diff --git a/coin/provisioning/common/install-ruby.ps1 b/coin/provisioning/common/install-ruby.ps1 index 57cf227f..94e32b74 100644 --- a/coin/provisioning/common/install-ruby.ps1 +++ b/coin/provisioning/common/install-ruby.ps1 @@ -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 diff --git a/coin/provisioning/common/ruby.ps1 b/coin/provisioning/common/ruby.ps1 deleted file mode 100644 index f7813c20..00000000 --- a/coin/provisioning/common/ruby.ps1 +++ /dev/null @@ -1,7 +0,0 @@ -. "$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.intra.qt.io/input/ruby/rubyinstaller-2.3.1.exe $installer -Verify-Checksum $installer "FF377F6F313849C3B0CD72EEC1EFFA436F0E4A36" -& $installer /DIR=C:\ruby /VERYSILENT diff --git a/coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps1 b/coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps1 new file mode 100644 index 00000000..0d28ea1e --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-ruby.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/ruby.ps1 b/coin/provisioning/qtci-windows-10-x86/ruby.ps1 deleted file mode 100644 index 587a4c10..00000000 --- a/coin/provisioning/qtci-windows-10-x86/ruby.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\ruby.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/ruby.ps1 b/coin/provisioning/qtci-windows-10-x86_64/ruby.ps1 deleted file mode 100644 index 587a4c10..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/ruby.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\ruby.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/33-ruby.ps1 b/coin/provisioning/qtci-windows-7-x86/33-ruby.ps1 deleted file mode 100644 index 587a4c10..00000000 --- a/coin/provisioning/qtci-windows-7-x86/33-ruby.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\ruby.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/ruby.ps1 b/coin/provisioning/qtci-windows-7-x86/ruby.ps1 deleted file mode 100644 index 587a4c10..00000000 --- a/coin/provisioning/qtci-windows-7-x86/ruby.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\ruby.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/26-ruby.ps1 b/coin/provisioning/qtci-windows-7-x86_64/26-ruby.ps1 deleted file mode 100644 index 587a4c10..00000000 --- a/coin/provisioning/qtci-windows-7-x86_64/26-ruby.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\ruby.ps1" |