Merge pull request #6257 from kit-ty-kate/rel-2.3.0-beta2

Release 2.3.0~beta2
ocaml · Oct 23, 2024 · 4275a0e · 4275a0e
2 parents b299f5f + d7d5a4d
commit 4275a0e
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 27 deletions.
diff --git a/CHANGES b/CHANGES
@@ -3,6 +3,20 @@ 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~beta2:
+* Fix the detection of the current terminal size
+  [#6244 @kit-ty-kate - fix #6243]
+* Ensure the output of opam commands using a column style UI stay consistent
+  accross environment by setting the number of columns to 80 if stdout is not
+  a tty and if the `COLUMNS` env variable is not set [#6244 @kit-ty-kate]
+* 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

diff --git a/configure b/configure
diff --git a/configure.ac b/configure.ac
@@ -1,5 +1,5 @@
 dnl The line below must be formatted AC_INIT([opam],[VERSION]) with no extra spaces
-AC_INIT([opam],[2.3.0~beta2~dev])
+AC_INIT([opam],[2.3.0~beta2])
 AC_COPYRIGHT(Copyright 2012-2019 OcamlPro SAS)
 
 AC_CONFIG_MACRO_DIR([m4])

diff --git a/master_changes.md b/master_changes.md
@@ -11,7 +11,6 @@ moved, etc.), please update the _API updates_ part (it helps opam library
 users)
 
 ## Version
-  * Bump the version to 2.3.0\~beta2\~dev [#6240 @kit-ty-kate]
 
 ## Global CLI
 
@@ -30,8 +29,6 @@ users)
 ## Remove
 
 ## UI
-  * [BUG] Fix the detection of the current terminal size [#6244 @kit-ty-kate - fix #6243]
-  * [BUG] Ensure the output of opam commands using a column style UI stay consistent accross environment by setting the number of columns to 80 if stdout is not a tty and if the `COLUMNS` env variable is not set [#6244 @kit-ty-kate]
 
 ## Switch
 
@@ -78,11 +75,6 @@ users)
 ## Infrastructure
 
 ## Release scripts
-  * Upgrade the Alpine Linux container where the Linux release binaries are built from Alpine 3.13 to 3.20 [#6237 @kit-ty-kate]
-  * Make the release script produce a Linux/riscv64 binary [#6237 @kit-ty-kate]
-  * Upgrade the FreeBSD qemu image where the FreeBSD binary is built from FreeBSD 13.2 to 14.1 [#6237 @kit-ty-kate]
-  * Upgrade the OpenBSD qemu image where the OpenBSD binary is built from OpenBSD 7.4 to 7.6 [#6237 @kit-ty-kate]
-  * Simplify and improve the reliability of the one-click release script by switching away from a passwordless setup [#6237 @kit-ty-kate]
 
 ## Install script
 
@@ -131,4 +123,3 @@ users)
 ## opam-format
 
 ## opam-core
-  * `OpamStubs.get_stdout_ws_col`: new Unix-only function returning the number of columns of the current terminal window [#6244 @kit-ty-kate]
diff --git a/opam-client.opam b/opam-client.opam
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.3.0~beta2~dev"
+version: "2.3.0~beta2"
 synopsis: "Client library for opam 2.3"
 description: """
 Actions on the opam root, switches, installations, and front-end.

diff --git a/opam-core.opam b/opam-core.opam
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.3.0~beta2~dev"
+version: "2.3.0~beta2"
 synopsis: "Core library for opam 2.3"
 description:
   "Small standard library extensions, and generic system interaction modules used by opam."

diff --git a/opam-devel.opam b/opam-devel.opam
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.3.0~beta2~dev"
+version: "2.3.0~beta2"
 synopsis: "Bootstrapped development binary for opam 2.3"
 description: """
 This package compiles (bootstraps) opam. For consistency and safety of the installation, the binaries are not installed into the PATH, but into lib/opam-devel, from where the user can manually install them system-wide.

diff --git a/opam-format.opam b/opam-format.opam
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.3.0~beta2~dev"
+version: "2.3.0~beta2"
 synopsis: "Format library for opam 2.3"
 description: """
 Definition of opam datastructures and its file interface.

diff --git a/opam-installer.opam b/opam-installer.opam
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.3.0~beta2~dev"
+version: "2.3.0~beta2"
 synopsis: "Installation of files to a prefix, following opam conventions"
 description: """
 opam-installer is a small tool that can read *.install files, as defined by opam [1], and execute them to install or remove package files without going through opam.

diff --git a/opam-repository.opam b/opam-repository.opam
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.3.0~beta2~dev"
+version: "2.3.0~beta2"
 synopsis: "Repository library for opam 2.3"
 description: """
 This library includes repository and remote sources handling, including curl/wget, rsync, git, mercurial, darcs backends.

diff --git a/opam-solver.opam b/opam-solver.opam
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.3.0~beta2~dev"
+version: "2.3.0~beta2"
 synopsis: "Solver library for opam 2.3"
 description: """
 Solver and Cudf interaction. This library is based on the Cudf and Dose libraries, and handles calls to the external solver from opam.

diff --git a/opam-state.opam b/opam-state.opam
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.3.0~beta2~dev"
+version: "2.3.0~beta2"
 synopsis: "State library for opam 2.3"
 description: """
 Handling of the ~/.opam hierarchy, repository and switch states.