Misc Windows CI updates #2

lukebakken · lukebakken · commit c582de2f2ad4 · 2023-07-28T14:39:59.000-07:00
* Modify how RabbitMQ install dir is found in gha-run-tests.ps1 (cherry picked from commit 5f155d1)
diff --git a/.ci/gha-run-tests.ps1 b/.ci/gha-run-tests.ps1
@@ -14,13 +14,12 @@ Write-Host "[INFO] Setting ERLANG_HOME to '$erlang_home'..."
 $env:ERLANG_HOME = $erlang_home
 [Environment]::SetEnvironmentVariable('ERLANG_HOME', $erlang_home, 'Machine')
 
+$rabbitmq_base_path = (Get-ItemProperty -Name Install_Dir -Path 'HKLM:\SOFTWARE\WOW6432Node\VMware, Inc.\RabbitMQ Server').Install_Dir
 $regPath = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\RabbitMQ'
 if (Test-Path 'HKLM:\SOFTWARE\WOW6432Node\')
 {
     $regPath = 'HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\RabbitMQ'
 }
-
-$rabbitmq_base_path = Split-Path -Parent (Get-ItemProperty $regPath 'UninstallString').UninstallString
 $rabbitmq_version = (Get-ItemProperty $regPath "DisplayVersion").DisplayVersion
 $rabbitmqctl_path = Join-Path -Path $rabbitmq_base_path -ChildPath "rabbitmq_server-$rabbitmq_version" | Join-Path -ChildPath 'sbin' | Join-Path -ChildPath 'rabbitmqctl.bat'
 

Original file line number	Diff line number	Diff line change
`@@ -14,13 +14,12 @@ Write-Host "[INFO] Setting ERLANG_HOME to '$erlang_home'..."`
`14`	`14`	`$env:ERLANG_HOME = $erlang_home`
`15`	`15`	`[Environment]::SetEnvironmentVariable('ERLANG_HOME', $erlang_home, 'Machine')`
`16`	`16`
	`17`	`+$rabbitmq_base_path = (Get-ItemProperty -Name Install_Dir -Path 'HKLM:\SOFTWARE\WOW6432Node\VMware, Inc.\RabbitMQ Server').Install_Dir`
`17`	`18`	`$regPath = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\RabbitMQ'`
`18`	`19`	`if (Test-Path 'HKLM:\SOFTWARE\WOW6432Node\')`
`19`	`20`	`{`
`20`	`21`	`$regPath = 'HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\RabbitMQ'`
`21`	`22`	`}`
`22`		`-`
`23`		`-$rabbitmq_base_path = Split-Path -Parent (Get-ItemProperty $regPath 'UninstallString').UninstallString`
`24`	`23`	`$rabbitmq_version = (Get-ItemProperty $regPath "DisplayVersion").DisplayVersion`
`25`	`24`	`$rabbitmqctl_path = Join-Path -Path $rabbitmq_base_path -ChildPath "rabbitmq_server-$rabbitmq_version" \| Join-Path -ChildPath 'sbin' \| Join-Path -ChildPath 'rabbitmqctl.bat'`
`26`	`25`