From cc6facab16600fd79d822e6e37deb42abefe7b0f Mon Sep 17 00:00:00 2001 From: Clement Tsang <34804052+ClementTsang@users.noreply.github.com> Date: Wed, 4 Nov 2026 11:12:38 +0800 Subject: [PATCH] packaging: allow wix (msi) to do same-version upgrades (#2304) Make it so the wix config (MSI installer) allows same-version upgrades. Pulled from #2302, kudos to @meop for the recommendation. --- CHANGELOG.md | 5 +++++ scripts/ci/setup_windows_gnullvm.ps1 | 2 +- wix/main.wxs | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1806d1f4..29d5a080 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,6 +33,11 @@ That said, these are more guidelines rather than hard rules, though the project - [#2300](https://github.com/ClementTsang/bottom/pull/2300): Fix dialog screens not blocking certain user events. - [#2298](https://github.com/ClementTsang/bottom/pull/2298): Fix hidden table columns shifting the widths of later columns and header clicks. +### Other + +- [#2302](https://github.com/ClementTsang/bottom/pull/2302): Make the `aarch64-pc-windows-gnullvm` target statically linked. +- [#2304](https://github.com/ClementTsang/bottom/pull/2304): Enable same-version upgrades for the Windows MSI installer. + ## 0.15.0 - 2026-10-31 🎃 ### Features diff --git a/scripts/ci/setup_windows_gnullvm.ps1 b/scripts/ci/setup_windows_gnullvm.ps1 index 29096d11..183364ef 100644 --- a/scripts/ci/setup_windows_gnullvm.ps1 +++ b/scripts/ci/setup_windows_gnullvm.ps1 @@ -1,7 +1,7 @@ $ErrorActionPreference = 'Stop' $msys2 = 'C:\msys64' -$package = 'mingw-w64-clang-aarch64-clang=23.1.4-1' +$package = 'mingw-w64-clang-aarch64-clang' & "$msys2\usr\bin\bash.exe" -lc 'pacman --noconfirm -Sy' if ($LASTEXITCODE -ne 0) { throw 'Failed to synchronize the MSYS2 package databases' diff --git a/wix/main.wxs b/wix/main.wxs index 4c6c0234..1ac8d1a5 100644 --- a/wix/main.wxs +++ b/wix/main.wxs @@ -55,6 +55,7 @@