Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update msys2 installer #1648

Merged
merged 2 commits into from
Mar 18, 2024
Merged

Update msys2 installer #1648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f78fedb
Update msys2 installer
mosteo Mar 15, 2024
431f72a
Ensure msys2 from commit is tested
mosteo Mar 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/workflows/ci-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
1 change: 1 addition & 0 deletions RELEASING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 versions
- `Alire.Version`
Expand Down
11 changes: 7 additions & 4 deletions src/alire/os_windows/alire-settings-builtins-windows.ads
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading