From 1dee4e9fcaba0cce26a1054530b3ab5958cf2434 Mon Sep 17 00:00:00 2001
From: Joni Jantti <joni.jantti@qt.io>
Date: Thu, 7 Dec 2017 12:52:19 +0200
Subject: Fix broken and duplicate Ruby provisioning
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 coin/provisioning/common/install-ruby.ps1 | 14 ++++++--------
 coin/provisioning/common/ruby.ps1         |  7 -------
 2 files changed, 6 insertions(+), 15 deletions(-)
 delete mode 100644 coin/provisioning/common/ruby.ps1

(limited to 'coin/provisioning/common')

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
-- 
cgit v1.2.3