From 6ec123ed753d7f2465556196dfd180bfcf998660 Mon Sep 17 00:00:00 2001 From: "Alejandro R. Mosteo" Date: Fri, 5 Jul 2024 13:12:55 +0200 Subject: [PATCH] v2.0.2-rc1 --- RELEASING.md | 1 + alire.toml | 4 ++-- src/alire/alire-version.ads | 3 ++- .../os_windows/alire-settings-builtins-windows.ads | 10 +++++++++- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/RELEASING.md b/RELEASING.md index 9e4331df..e59618a0 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -18,6 +18,7 @@ - Tag corresponding commit as vX.X.X (github does it if missing). - Use autogenerated release notes. - Credit all collaborators (if release notes aren't exhaustive). +1. Update Alire.Version and alire.toml to -dev in release branch. 1. [ ] Update stable version used in alire-index workflows - We used to use default in setup-alire, but by making it explicit we can test the new release before making it the default for everyone (next step). diff --git a/alire.toml b/alire.toml index a928140f..fad6eb21 100644 --- a/alire.toml +++ b/alire.toml @@ -1,7 +1,7 @@ name = "alr" description = "Command-line tool from the Alire project" -version = "2.0.1" +version = "2.0.2" authors = ["Alejandro R. Mosteo", "Fabien Chouteau", "Pierre-Marie de Rodat"] maintainers = ["alejandro@mosteo.com", "chouteau@adacore.com"] @@ -116,4 +116,4 @@ command = ["pwsh", "scripts/version-patcher.ps1", "_or_later"] [actions.'case(os)'.'...'] type = "post-build" -command = ["scripts/version-patcher.sh", "_or_later"] \ No newline at end of file +command = ["scripts/version-patcher.sh", "_or_later"] diff --git a/src/alire/alire-version.ads b/src/alire/alire-version.ads index 0cedac01..36185b62 100644 --- a/src/alire/alire-version.ads +++ b/src/alire/alire-version.ads @@ -16,7 +16,8 @@ private -- be replaced by `alr build` with the current commit, and appended with -- "_or_later" after build. - Current_Str : constant String := "2.0.2-dev"; + Current_Str : constant String := "2.0.2"; + -- 2.0.2: quarterly bugfix maintenance release -- 2.0.1: fix `alr install` and minor fixes -- 2.0.0: alr settings refactor and minor fixes -- 2.0.0-rc1: release candidate for 2.0 diff --git a/src/alire/os_windows/alire-settings-builtins-windows.ads b/src/alire/os_windows/alire-settings-builtins-windows.ads index cc27adc8..588faa87 100644 --- a/src/alire/os_windows/alire-settings-builtins-windows.ads +++ b/src/alire/os_windows/alire-settings-builtins-windows.ads @@ -1,12 +1,20 @@ +with AAA.Strings; + -- Ensure config is loaded for some defaults below with Alire.Settings.Edit.Early_Load; pragma Unreferenced (Alire.Settings.Edit.Early_Load); package Alire.Settings.Builtins.Windows is + Latest_Msys2 : constant String := "2024-05-07"; + -- Update here to upgrade to the latest release + + Date_1 : String renames Latest_Msys2; + Date_2 : String renames AAA.Strings.Replace (Date_1, "-", ""); + 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"; + := "https://github.com/msys2/msys2-installer/releases/download/" & Date_1 & "/msys2-x86_64-" & Date_2 & ".exe"; pragma Style_Checks ("M80"); Default_Msys2_Installer : constant String -- 2.39.5