From d7d5a4d92dbe07aff3e14babf00028b08e9a1a62 Mon Sep 17 00:00:00 2001 From: Kate Date: Wed, 23 Oct 2024 14:55:50 +0100 Subject: [PATCH] Release 2.3.0~beta2 --- CHANGES | 14 ++++++++++++++ configure | 18 +++++++++--------- configure.ac | 2 +- master_changes.md | 9 --------- opam-client.opam | 2 +- opam-core.opam | 2 +- opam-devel.opam | 2 +- opam-format.opam | 2 +- opam-installer.opam | 2 +- opam-repository.opam | 2 +- opam-solver.opam | 2 +- opam-state.opam | 2 +- 12 files changed, 32 insertions(+), 27 deletions(-) diff --git a/CHANGES b/CHANGES index 3925e650ff1..8c0eb22c583 100644 --- 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 index c2a8d7bbc7e..4e36231babd 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for opam 2.3.0~beta2~dev. +# Generated by GNU Autoconf 2.71 for opam 2.3.0~beta2. # # # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, @@ -609,8 +609,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='opam' PACKAGE_TARNAME='opam' -PACKAGE_VERSION='2.3.0~beta2~dev' -PACKAGE_STRING='opam 2.3.0~beta2~dev' +PACKAGE_VERSION='2.3.0~beta2' +PACKAGE_STRING='opam 2.3.0~beta2' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1300,7 +1300,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures opam 2.3.0~beta2~dev to adapt to many kinds of systems. +\`configure' configures opam 2.3.0~beta2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1362,7 +1362,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of opam 2.3.0~beta2~dev:";; + short | recursive ) echo "Configuration of opam 2.3.0~beta2:";; esac cat <<\_ACEOF @@ -1478,7 +1478,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -opam configure 2.3.0~beta2~dev +opam configure 2.3.0~beta2 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1595,7 +1595,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by opam $as_me 2.3.0~beta2~dev, which was +It was created by opam $as_me 2.3.0~beta2, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -7613,7 +7613,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by opam $as_me 2.3.0~beta2~dev, which was +This file was extended by opam $as_me 2.3.0~beta2, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7668,7 +7668,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -opam config.status 2.3.0~beta2~dev +opam config.status 2.3.0~beta2 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index eddb264490b..cd07fe5a05c 100644 --- 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 index 9e2337a01dd..3787f1800ce 100644 --- 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 index dee3af7a1fe..42c392fbc4e 100644 --- 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 index c55955e4760..5906293e7ee 100644 --- 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 index dda5fa80137..e57064d5a03 100644 --- 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 index c176f988d8c..f9bb90b9e4a 100644 --- 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 index 1a9116cccd9..d5a6f5c5be7 100644 --- 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 index 25273b66a4f..8709a36f28f 100644 --- 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 index 11ffbaea9fe..4c5535755a6 100644 --- 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 index 4aac1d5129e..0fbdf7cc2ee 100644 --- 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.