From 56b7985075355b9a636c645a1f3fcf3114425f77 Mon Sep 17 00:00:00 2001 From: Kate Date: Wed, 30 Oct 2024 14:03:10 +0000 Subject: [PATCH 1/3] Release 2.3.0~rc1 --- CHANGES | 4 ++++ configure | 18 +++++++++--------- configure.ac | 2 +- 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 +- 11 files changed, 22 insertions(+), 18 deletions(-) diff --git a/CHANGES b/CHANGES index 8c0eb22c583..dc3f6de4701 100644 --- a/CHANGES +++ b/CHANGES @@ -3,6 +3,10 @@ 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] diff --git a/configure b/configure index e72f24bc281..7cf2abdfe9e 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~beta3~dev. +# Generated by GNU Autoconf 2.71 for opam 2.3.0~rc1. # # # 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~beta3~dev' -PACKAGE_STRING='opam 2.3.0~beta3~dev' +PACKAGE_VERSION='2.3.0~rc1' +PACKAGE_STRING='opam 2.3.0~rc1' 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~beta3~dev to adapt to many kinds of systems. +\`configure' configures opam 2.3.0~rc1 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~beta3~dev:";; + short | recursive ) echo "Configuration of opam 2.3.0~rc1:";; 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~beta3~dev +opam configure 2.3.0~rc1 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~beta3~dev, which was +It was created by opam $as_me 2.3.0~rc1, 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~beta3~dev, which was +This file was extended by opam $as_me 2.3.0~rc1, 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~beta3~dev +opam config.status 2.3.0~rc1 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index bb0ad845474..7ec6306f989 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~beta3~dev]) +AC_INIT([opam],[2.3.0~rc1]) AC_COPYRIGHT(Copyright 2012-2019 OcamlPro SAS) AC_CONFIG_MACRO_DIR([m4]) diff --git a/opam-client.opam b/opam-client.opam index 39065169680..4ecb696050b 100644 --- a/opam-client.opam +++ b/opam-client.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "2.3.0~beta3~dev" +version: "2.3.0~rc1" 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 58ee5932f40..2551a3a8a4c 100644 --- a/opam-core.opam +++ b/opam-core.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "2.3.0~beta3~dev" +version: "2.3.0~rc1" 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 5fa6d7ece9b..bc37d98666d 100644 --- a/opam-devel.opam +++ b/opam-devel.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "2.3.0~beta3~dev" +version: "2.3.0~rc1" 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 7f74b80652d..4ad2996d336 100644 --- a/opam-format.opam +++ b/opam-format.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "2.3.0~beta3~dev" +version: "2.3.0~rc1" 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 7fc095b5648..65b987271f8 100644 --- a/opam-installer.opam +++ b/opam-installer.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "2.3.0~beta3~dev" +version: "2.3.0~rc1" 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 51f87a70540..331f4cd5749 100644 --- a/opam-repository.opam +++ b/opam-repository.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "2.3.0~beta3~dev" +version: "2.3.0~rc1" 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 eb69fa8f7df..b6be9e537ac 100644 --- a/opam-solver.opam +++ b/opam-solver.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "2.3.0~beta3~dev" +version: "2.3.0~rc1" 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 bb7c21c48ef..a4392a88227 100644 --- a/opam-state.opam +++ b/opam-state.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "2.3.0~beta3~dev" +version: "2.3.0~rc1" synopsis: "State library for opam 2.3" description: """ Handling of the ~/.opam hierarchy, repository and switch states. From efc26599e91f6d4cb1d0879fdde9e3dd3f5ec1f0 Mon Sep 17 00:00:00 2001 From: Kate Date: Wed, 30 Oct 2024 14:45:56 +0000 Subject: [PATCH 2/3] 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 6e99b4f5b5c6a2d256ac2d84b698a3d072b06263 Mon Sep 17 00:00:00 2001 From: Kate Date: Wed, 30 Oct 2024 14:59:54 +0000 Subject: [PATCH 3/3] Remove wrongly assumed change from the changelog of 2.3.0~beta2 --- CHANGES | 3 --- 1 file changed, 3 deletions(-) diff --git a/CHANGES b/CHANGES index dc3f6de4701..1ae4709696a 100644 --- a/CHANGES +++ b/CHANGES @@ -10,9 +10,6 @@ are not marked). Those prefixed with "(+)" are new command/option (since 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]