From ef188ebc8ef15a1b9c7c63c3eae68c38c03dfa2e Mon Sep 17 00:00:00 2001 From: Kate Date: Wed, 30 Oct 2024 14:45:56 +0000 Subject: [PATCH 1/2] Improve wording in the release steps --- release/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/readme.md b/release/readme.md index 275e80520ce..c250f8f4b84 100644 --- a/release/readme.md +++ b/release/readme.md @@ -4,7 +4,7 @@ * update version in all the opam files and in configure.ac * run `make configure` to regenerate `./configure` [checked by github actions] * update copyright headers -* if you're releasing the first final release of a new branch (e.g. 2.2.0): make sure `root_version` in OpamFile.ml is set to the final release number (e.g. for 2.2.0, root_version should be 2.2). Make sure that opamFormatUpgrade.ml also contains an upgrade function from the previous version (that function will most likely be empty) +* if you're releasing the first final release of a new branch (e.g. 2.2.0) and the `root_version` has changed since the previous stable version (e.g. 2.1.6): make sure `root_version` in OpamFile.ml is set to the final release number (e.g. for 2.2.0, `root_version` should be 2.2). Make sure that `opamFormatUpgrade.ml` also contains an upgrade function from the previous version (that function will most likely be empty), and that `opamroot-versions.test` is updated accordingly too. * run `make tests`, `opam-rt` [checked by github actions] * update the CHANGE file: take `master_changes.md` content to fill it From 2e924e63701cc7f1f7ec64dd7b26156c3cf06227 Mon Sep 17 00:00:00 2001 From: Kate Date: Thu, 31 Oct 2024 14:18:11 +0000 Subject: [PATCH 2/2] Port missing changelog from the 2.3 branch --- CHANGES | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/CHANGES b/CHANGES index eeae4daa534..2af05daac04 100644 --- a/CHANGES +++ b/CHANGES @@ -3,6 +3,21 @@ repositories (changes that are automatically handled by the format upgrade tools are not marked). Those prefixed with "(+)" are new command/option (since 2.1.0~alpha2). +2.3.0~rc1: +* Improve the release script by adding a NetBSD/x86_64 binary + [#6258 @kit-ty-kate] + +2.3.0~beta2: +* Fix the detection of the current terminal size + [#6244 @kit-ty-kate - fix #6243] +* Improve the release script by upgrading the platform building the Linux + binaries to Alpine 3.20, the FreeBSD binary to FreeBSD 14.1 and the + OpenBSD binary to OpenBSD 7.6 [#6237 @kit-ty-kate] +* Make the release script produce a Linux/riscv64 binary [#6237 @kit-ty-kate] +* API changes + * `OpamStubs.get_stdout_ws_col`: new Unix-only function returning the + number of columns of the current terminal window [#6244 @kit-ty-kate] + 2.3.0~beta1: * Fix an opam 2.1 regression where the initial pin of a local VCS directory would store untracked and ignored files. Those files would usually be