From 47e68c4273f9619ed810e647be4c7c7a8ac3db8d Mon Sep 17 00:00:00 2001 From: Kate Date: Mon, 14 Oct 2024 12:57:38 +0100 Subject: [PATCH] Release 2.3.0~beta1 --- CHANGES | 41 +++++++++++++++++++++++++++++++++++++++++ configure | 18 +++++++++--------- configure.ac | 2 +- master_changes.md | 25 ------------------------- opam-client.opam | 4 ++-- opam-core.opam | 4 ++-- opam-devel.opam | 4 ++-- opam-format.opam | 4 ++-- opam-installer.opam | 2 +- opam-repository.opam | 4 ++-- opam-solver.opam | 4 ++-- opam-state.opam | 4 ++-- 12 files changed, 66 insertions(+), 50 deletions(-) diff --git a/CHANGES b/CHANGES index f253622f402..3925e650ff1 100644 --- a/CHANGES +++ b/CHANGES @@ -3,6 +3,47 @@ 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~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 + cleaned before building the package, however git submodules would not be + cleaned and would cause issues when paired with the new behaviour added in + 2.3.0~alpha1 which makes opam error when git submodules fail to update + (was previously a warning) [#6221 @rjbou - fix #5809] +* Fix a regression which would make opam crash on platforms where + `getconf LONG_BIT` is not available (e.g. OpenBSD) + [#6230 @kit-ty-kate - fix #6215] +* Fix the installed packages internal cache, which was storing the wrong + version of the opam file after a build failure. This could be triggered + easily for users with custom repositories with non-populated extra-files + [#6213 @kit-ty-kate] +* Fix a regression in lint W59 with local urls that are not archives + [#6219 @rjbou - fix #6218] +* Bump to lang dune to 2.8 and bump the requirement to dune >= 2.8, which was + actually required in the previous alpha release [#6204 @kit-ty-kate] +* Bump the vendored version of dune to 3.16.0, cppo to 1.7.0 and extlib to 1.8.0 + [#6223 @kit-ty-kate] +* Fix compilation with OCaml 5.3 when using the vendored extlib by updating to + the 5.3 compatible version [#6223 @kit-ty-kate] +* Fix the compilation of opam on Windows with OCaml >= 5.0 (again) + [#6216 @kit-ty-kate] +* Fix the release script after the bump to dune lang 2.6 and the introduction of + `opam_core_stubs` [#6204 @kit-ty-kate] +* Improve the release script by ignoring interactive questions asked by the + FreeBSD package manager [#6204 @kit-ty-kate] +* Improve and extend the tests [#6135 #6221 #6213 #6219 @rjbou] +* Improve the test infrastructure [#6233 #6233 #6216 @rjbou @kit-ty-kate] +* API changes + * `OpamStd.Sys.{get_terminal_columns,uname,getconf,guess_shell_compat}`: + Harden the process calls to account for failures + [#6230 @kit-ty-kate - fix #6215] + * `OpamStd.Sys.{uname,getconf}`: now accepts only one argument as parameter, + as per their documentation [#6230 @kit-ty-kate] + * `OpamSwitchState.Installed_cache`: export `load` function [#6233 @rjbou] + * `OpamSystem`: add `is_archive_from_string` that does the same than + `is_archive` but without looking at the file, only analysing the string + (extension) [#6219 @rjbou] + 2.3.0~alpha1: * (*) When loading a repository, don't automatically populate `extra-files:` field with found files in `files/` [#5564 @rjbou] diff --git a/configure b/configure index d9e3fb3624d..f6237ceb285 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~alpha2~dev. +# Generated by GNU Autoconf 2.71 for opam 2.3.0~beta1. # # # 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~alpha2~dev' -PACKAGE_STRING='opam 2.3.0~alpha2~dev' +PACKAGE_VERSION='2.3.0~beta1' +PACKAGE_STRING='opam 2.3.0~beta1' 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~alpha2~dev to adapt to many kinds of systems. +\`configure' configures opam 2.3.0~beta1 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~alpha2~dev:";; + short | recursive ) echo "Configuration of opam 2.3.0~beta1:";; 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~alpha2~dev +opam configure 2.3.0~beta1 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~alpha2~dev, which was +It was created by opam $as_me 2.3.0~beta1, 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~alpha2~dev, which was +This file was extended by opam $as_me 2.3.0~beta1, 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~alpha2~dev +opam config.status 2.3.0~beta1 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 6e7d5511faf..8f8d760604e 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~alpha2~dev]) +AC_INIT([opam],[2.3.0~beta1]) AC_COPYRIGHT(Copyright 2012-2019 OcamlPro SAS) AC_CONFIG_MACRO_DIR([m4]) diff --git a/master_changes.md b/master_changes.md index 3a0e91f1ba6..00be362c74e 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 of opam to 2.3.0~alpha2~dev [#6204 @kit-ty-kate] ## Global CLI @@ -22,7 +21,6 @@ users) ## Config report ## Actions - * Fix the install cache storing the wrong version of the opam file after a build failure [#6213 @kit-ty-kate] ## Install @@ -35,7 +33,6 @@ users) ## Config ## Pin - * [BUG] Fix first retrieval of local VCS pin done as local path [#6221 @rjbou - fix #5809] ## List @@ -52,7 +49,6 @@ users) ## Source ## Lint - * [BUG] fix lint W59 with local urls that are not archives [#6219 @rjbou - fix #6218] ## Repository @@ -73,17 +69,10 @@ users) ## VCS ## Build - * Bump the requirement for dune to 2.8 [#6204 @kit-ty-kate] - * Bump the vendored version of dune to 3.16.0, cppo to 1.7.0 and extlib to 1.8.0 [#6223 @kit-ty-kate] - * Fix compilation with OCaml 5.3 when using the vendored extlib by updating to the 5.3 compatible version (e.g. `make cold` or `./configure --with-vendored-deps`) [#6223 @kit-ty-kate] - * Fix the compilation of opam on Windows with OCaml >= 5.0 again [#6216 @kit-ty-kate] ## Infrastructure ## Release scripts - * Fix the release script after the bump of dune lang to 2.6 [#6204 @kit-ty-kate] - * Fix the release script after the introduction of opam\_core\_stubs [#6204 @kit-ty-kate] - * Improve the release script by ignoring interactive questions asked by the FreeBSD package manager [#6204 @kit-ty-kate] ## Install script @@ -111,20 +100,10 @@ users) ## Reftests ### Tests - * Move pin test to pin-legacy [#6135 @rjbou] - * More exhaustive test for pin command: test different behaviour and cli options [#6135 @rjbou] - * pin: add a test for erroneous first fetch done as local path on local VCS pinned packages [#6221 @rjbou] - * Add cache test for installed packages cache update after an action failure [#6213 @kit-ty-kate @rjbou] - * Add more tests for lint W59 [#6219 @rjbou] ### Engine - * Update print file function [#6233 @rjbou] - * Add `opam-cache` command, to display internal cache content in reftest [#6233 @rjbou] ## Github Actions - * Add OCaml 5.2.0 to the build matrix [#6216 @kit-ty-kate] - * Allow to have more than one OCaml default version to run all jobs and add 5.2 to the list of default versions together with 4.14 [#6216 @kit-ty-kate] - * Bump 4.14 to the latest patch version (4.14.2) [#6216 @kit-ty-kate] ## Doc @@ -136,13 +115,9 @@ users) ## opam-repository ## opam-state - * `OpamSwitchState.Installed_cache`: export `load` function [#6233 @rjbou] ## opam-solver ## opam-format ## opam-core - * `OpamStd.Sys.{get_terminal_columns,uname,getconf,guess_shell_compat}`: Harden the process calls to account for failures [#6230 @kit-ty-kate - fix #6215] - * `OpamStd.Sys.{uname,getconf}`: now accepts only one argument as parameter, as per their documentation [#6230 @kit-ty-kate] - * `OpamSystem`: add `is_archive_from_string` that does the same than `is_archive` but without looking at the file, only analysing the string (extension) [#6219 @rjbou] diff --git a/opam-client.opam b/opam-client.opam index dd3a6126a7f..7ecde43549c 100644 --- a/opam-client.opam +++ b/opam-client.opam @@ -1,6 +1,6 @@ opam-version: "2.0" -version: "2.3.0~alpha2~dev" -synopsis: "Client library for opam 2.2" +version: "2.3.0~beta1" +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 15647ab1a01..e75c045ce26 100644 --- a/opam-core.opam +++ b/opam-core.opam @@ -1,6 +1,6 @@ opam-version: "2.0" -version: "2.3.0~alpha2~dev" -synopsis: "Core library for opam 2.2" +version: "2.3.0~beta1" +synopsis: "Core library for opam 2.3" description: "Small standard library extensions, and generic system interaction modules used by opam." maintainer: "opam-devel@lists.ocaml.org" diff --git a/opam-devel.opam b/opam-devel.opam index 1d0d03acfa8..dd68ed883df 100644 --- a/opam-devel.opam +++ b/opam-devel.opam @@ -1,6 +1,6 @@ opam-version: "2.0" -version: "2.3.0~alpha2~dev" -synopsis: "Bootstrapped development binary for opam 2.2" +version: "2.3.0~beta1" +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 ac0ab011ecf..94c15f88f29 100644 --- a/opam-format.opam +++ b/opam-format.opam @@ -1,6 +1,6 @@ opam-version: "2.0" -version: "2.3.0~alpha2~dev" -synopsis: "Format library for opam 2.2" +version: "2.3.0~beta1" +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 a0d4c3f8164..8a710b9c5f9 100644 --- a/opam-installer.opam +++ b/opam-installer.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "2.3.0~alpha2~dev" +version: "2.3.0~beta1" 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 749e5ef58ec..ebadc067851 100644 --- a/opam-repository.opam +++ b/opam-repository.opam @@ -1,6 +1,6 @@ opam-version: "2.0" -version: "2.3.0~alpha2~dev" -synopsis: "Repository library for opam 2.2" +version: "2.3.0~beta1" +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 56462f55732..8488114a6d3 100644 --- a/opam-solver.opam +++ b/opam-solver.opam @@ -1,6 +1,6 @@ opam-version: "2.0" -version: "2.3.0~alpha2~dev" -synopsis: "Solver library for opam 2.2" +version: "2.3.0~beta1" +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 db0c61c75c6..b44a1ece6bd 100644 --- a/opam-state.opam +++ b/opam-state.opam @@ -1,6 +1,6 @@ opam-version: "2.0" -version: "2.3.0~alpha2~dev" -synopsis: "State library for opam 2.2" +version: "2.3.0~beta1" +synopsis: "State library for opam 2.3" description: """ Handling of the ~/.opam hierarchy, repository and switch states. """