Skip to content

Commit 7f7346b

Browse files
committed
Merge pull request #1366 from rabbitmq/lukebakken/win-ci-updates
Misc Windows CI updates (cherry picked from commit 0305ef3)
1 parent c8c1e10 commit 7f7346b

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

.ci/install.ps1

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ Write-Host "[INFO] Installing Erlang to $erlang_install_dir..."
3636

3737
$rabbitmq_installer_download_url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v$rabbitmq_ver/rabbitmq-server-$rabbitmq_ver.exe"
3838
$rabbitmq_installer_path = Join-Path -Path $base_installers_dir -ChildPath "rabbitmq-server-$rabbitmq_ver.exe"
39+
Write-Host "[INFO] rabbitmq installer path $rabbitmq_installer_path"
3940

4041
$erlang_reg_path = 'HKLM:\SOFTWARE\Ericsson\Erlang'
4142
if (Test-Path 'HKLM:\SOFTWARE\WOW6432Node\')
@@ -86,13 +87,14 @@ Write-Host '[INFO] Installing and starting RabbitMQ with default config...'
8687
& $rabbitmq_installer_path '/S' | Out-Null
8788
(Get-Service -Name RabbitMQ).Status
8889

90+
$rabbitmq_base_path = (Get-ItemProperty -Name Install_Dir -Path 'HKLM:\SOFTWARE\WOW6432Node\VMware, Inc.\RabbitMQ Server').Install_Dir
8991
$regPath = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\RabbitMQ'
9092
if (Test-Path 'HKLM:\SOFTWARE\WOW6432Node\')
9193
{
9294
$regPath = 'HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\RabbitMQ'
9395
}
94-
$rabbitmq_base_path = Split-Path -Parent (Get-ItemProperty $regPath 'UninstallString').UninstallString
95-
$rabbitmq_version = (Get-ItemProperty $regPath "DisplayVersion").DisplayVersion
96+
$rabbitmq_version = (Get-ItemProperty $regPath 'DisplayVersion').DisplayVersion
97+
Write-Host "[INFO] RabbitMQ version path: $rabbitmq_base_path and version: $rabbitmq_version"
9698

9799
$rabbitmq_home = Join-Path -Path $rabbitmq_base_path -ChildPath "rabbitmq_server-$rabbitmq_version"
98100
Write-Host "[INFO] Setting RABBITMQ_HOME to '$rabbitmq_home'..."
@@ -158,4 +160,4 @@ Write-Host '[INFO] Getting RabbitMQ status...'
158160

159161
$ErrorActionPreference = 'Continue'
160162
Write-Host '[INFO] Enabling plugins...'
161-
& $rabbitmq_plugins_path enable rabbitmq_management rabbitmq_stream rabbitmq_stream_management
163+
& $rabbitmq_plugins_path enable rabbitmq_management rabbitmq_stream rabbitmq_stream_management rabbitmq_amqp1_0

.ci/versions.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"erlang": "25.3",
3-
"rabbitmq": "3.11.13"
2+
"erlang": "26.0.2",
3+
"rabbitmq": "3.12.2"
44
}

0 commit comments

Comments
 (0)