Update msys2 installer (#1648)

* Update msys2 installer

* Ensure msys2 from commit is tested

.github/workflows/ci-windows.yml

@@ -13,6 +13,7 @@ on:
 
 env:
   ALIRE_OS:     windows
+  MSYS64_ROOT:  C:\Users\runneradmin\AppData\Local\alire\cache\msys64
   MINGW64_PATH: C:\Users\runneradmin\AppData\Local\alire\cache\msys64\mingw64\bin
   MSYS2_PATH:   C:\Users\runneradmin\AppData\Local\alire\cache\msys64\usr\bin
   PACMAN:       C:\Users\runneradmin\AppData\Local\alire\cache\msys64\usr\bin\pacman --noconfirm
@@ -38,6 +39,12 @@ jobs:
     - name: Build alr
       run: gprbuild -j0 -p -P alr_env
 
+    - name: Remove previous alr's msys2 (so a new one can be tested)
+      shell: pwsh
+      run: |
+        if (Test-Path "${{env.MSYS64_ROOT}}") {
+          Remove-Item "${{env.MSYS64_ROOT}}" -Recurse -Force }
+
     - name: Display built alr and trigger install of msys2
       run: ./bin/alr version
 

RELEASING.md

@@ -1,5 +1,6 @@
 ## Checklist for releasing a new version
 
+1. [ ] Update Msys2 installer at https://github.com/msys2/msys2-installer/releases/
 1. [ ] Run local-only tests (`/testsuite/run-dev-sh`)
 1. [ ] Update version in `Alire.Version`.
 1. [ ] Update version in `alire.toml`.

src/alire/os_windows/alire-settings-builtins-windows.ads

@@ -4,10 +4,13 @@ pragma Unreferenced (Alire.Settings.Edit.Early_Load);
 
 package Alire.Settings.Builtins.Windows is
 
-   Default_Msys2_Installer : constant String := "msys2-x86_64-20221216.exe";
-   Default_Msys2_Installer_URL : constant String :=
-     "https://github.com/msys2/msys2-installer/releases/download/2022-12-16/"
-     & Default_Msys2_Installer;
+   pragma Style_Checks ("M200");
+   Default_Msys2_Installer_URL : constant String
+     := "https://github.com/msys2/msys2-installer/releases/download/2024-01-13/msys2-x86_64-20240113.exe";
+   pragma Style_Checks ("M80");
+
+   Default_Msys2_Installer : constant String
+     := AAA.Strings.Split (Default_Msys2_Installer_URL, '/').Last_Element;
 
    --  MSYS2