From 48d8af3510e37acadcb477166aee0eac8dff8585 Mon Sep 17 00:00:00 2001 From: Kate Date: Wed, 21 Aug 2024 15:50:53 +0100 Subject: [PATCH] Release 2.2.1 --- CHANGES | 18 ++++++++++++++++++ configure | 18 +++++++++--------- configure.ac | 2 +- master_changes.md | 24 ------------------------ 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 +- opam.opam | 2 +- 13 files changed, 37 insertions(+), 43 deletions(-) diff --git a/CHANGES b/CHANGES index 5a7b8c65ca4..ef86753c06e 100644 --- a/CHANGES +++ b/CHANGES @@ -3,6 +3,24 @@ 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.2.1: +* (*) Fix a regression in `opam install --deps-only` where the direct + dependencies were not set as root packages [#6125 @rjbou] +* (*) Fix a regression when fetching git packages where the resulting git + repository could lead to unexpected outputs of git commands, by disabling + shallow clone by default except when fetching an opam repositories + [#6146 @kit-ty-kate - fix #6145] +* Mitigate curl/curl#13845 by falling back from `--write-out` to `--fail` + if exit code 43 is returned by curl [#6168 @dra27 - fix #6120] +* Synchronise opam-core.opam with opam-repository changes [#6043 @dra27] +* Fix and improve the release script and the creation of the + `opam-full-.tar.gz` archive [#6067 @kit-ty-kate] +* Improve and extend the tests [#6125 #6146 @rjbou] +* Improve the test infrastructure [#6079 #6081 @rjbou] +* API changes + * `?full_fetch` is now `true` by default instead of `false` + [#6146 @kit-ty-kate - fix #6145] + 2.2.0: * Bump `opam-root-version` to 2.2 [#5980 @kit-ty-kate] * Cygwin initialisation enhancement diff --git a/configure b/configure index 5ead825ca9c..9b89d07ff05 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.2.0. +# Generated by GNU Autoconf 2.71 for opam 2.2.1. # # # 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.2.0' -PACKAGE_STRING='opam 2.2.0' +PACKAGE_VERSION='2.2.1' +PACKAGE_STRING='opam 2.2.1' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1334,7 +1334,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.2.0 to adapt to many kinds of systems. +\`configure' configures opam 2.2.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1396,7 +1396,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of opam 2.2.0:";; + short | recursive ) echo "Configuration of opam 2.2.1:";; esac cat <<\_ACEOF @@ -1513,7 +1513,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -opam configure 2.2.0 +opam configure 2.2.1 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1710,7 +1710,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.2.0, which was +It was created by opam $as_me 2.2.1, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -7844,7 +7844,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.2.0, which was +This file was extended by opam $as_me 2.2.1, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7899,7 +7899,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.2.0 +opam config.status 2.2.1 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 5e5708f6d20..123f8029014 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.2.0]) +AC_INIT([opam],[2.2.1]) AC_COPYRIGHT(Copyright 2012-2019 OcamlPro SAS) AC_CONFIG_MACRO_DIR([m4]) diff --git a/master_changes.md b/master_changes.md index 342e085fa5a..1ab70ae3e4a 100644 --- a/master_changes.md +++ b/master_changes.md @@ -23,8 +23,6 @@ users) ## Actions ## Install - * [BUG] Fix `opam install --deps-only` set direct dependencies as root packages [#6125 @rjbou] - * Disable shallow clone by default except for opam repositories [#6146 @kit-ty-kate - fix #6145] ## Remove @@ -51,7 +49,6 @@ users) ## Lint ## Repository - * Mitigate curl/curl#13845 by falling back from --write-out to --fail if exit code 43 is returned by curl [#6168 @dra27 - fix #6120] ## Lock @@ -70,16 +67,10 @@ users) ## VCS ## Build - * Synchronise opam-core.opam with opam-repository changes [#6043 @dra27] ## Infrastructure ## Release scripts - * Add the missing mccs and dune archives to the opam-full-.tar.gz archive [#6067 @kit-ty-kate] - * Ensure the configure file stays as it is in the tag, in the opam-full-.tar.gz archive [#6067 @kit-ty-kate] - * Exclude the .git directory from the release archive when using GNU tar [#6067 @kit-ty-kate] - * Ensure non-existing %.cache target fail with a fatal error [#6067 @kit-ty-kate] - * Remove opam 2.1 support from the release script [#6084 @kit-ty-kate] ## Install script @@ -107,24 +98,10 @@ users) ## Reftests ### Tests - * Add a test for --deps-only setting direct dependencies as root packages [#6125 @rjbou] - * Add a package fetching test [#6146 @rjbou] ### Engine ## Github Actions - * Depexts: replace centos docker with almalinux to fake a centos [#6079 @rjbou] - * Depexts: fix conf package install check [#6079 @rjbou] - * Depexts: specify packages to test per distribution [#6079 @rjbou] - * Depexts: add update depexts check [#6079 @rjbou] - * Depexts: move parts to docker build image, for caching [#6079 @rjbou] - * Depexts: set version for conf packages to check [#6079 @rjbou] - * Depexts: add package to test containing `os-version` in filter [#6079 @rjbou] - * Depexts: fix opensuse job [#6079 @rjbou] - * Use actions/cache instead of our own fork ocaml-opam/cache [#6081 @rjbou] - * Update action cache to v4 [#6081 @rjbou] - * Update action checkout to v4 [#6081 @rjbou] - * Update action upload-artifact to v4 [#6081 @rjbou] ## Doc @@ -134,7 +111,6 @@ users) ## opam-client ## opam-repository - * `?full_fetch` is now `true` by default instead of `false` [#6146 @kit-ty-kate - fix #6145] ## opam-state diff --git a/opam-client.opam b/opam-client.opam index a684cfeefd1..0d2e793383b 100644 --- a/opam-client.opam +++ b/opam-client.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "2.2.0" +version: "2.2.1" synopsis: "Client library for opam 2.2" description: """ Actions on the opam root, switches, installations, and front-end. diff --git a/opam-core.opam b/opam-core.opam index f71ccd7f13c..8fdfe555779 100644 --- a/opam-core.opam +++ b/opam-core.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "2.2.0" +version: "2.2.1" synopsis: "Core library for opam 2.2" description: "Small standard library extensions, and generic system interaction modules used by opam." diff --git a/opam-devel.opam b/opam-devel.opam index 38b48cf27c9..607e635d33a 100644 --- a/opam-devel.opam +++ b/opam-devel.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "2.2.0" +version: "2.2.1" synopsis: "Bootstrapped development binary for opam 2.2" 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 c38afffaa80..1d73cbb7541 100644 --- a/opam-format.opam +++ b/opam-format.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "2.2.0" +version: "2.2.1" synopsis: "Format library for opam 2.2" description: """ Definition of opam datastructures and its file interface. diff --git a/opam-installer.opam b/opam-installer.opam index 694be5db7e6..cc542b86321 100644 --- a/opam-installer.opam +++ b/opam-installer.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "2.2.0" +version: "2.2.1" 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 2b01f94f25e..1dc8d74e890 100644 --- a/opam-repository.opam +++ b/opam-repository.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "2.2.0" +version: "2.2.1" synopsis: "Repository library for opam 2.2" 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 67d3c9f0c74..a1e78060954 100644 --- a/opam-solver.opam +++ b/opam-solver.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "2.2.0" +version: "2.2.1" synopsis: "Solver library for opam 2.2" 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 0d8042ed904..7b4dc6b228c 100644 --- a/opam-state.opam +++ b/opam-state.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "2.2.0" +version: "2.2.1" synopsis: "State library for opam 2.2" description: """ Handling of the ~/.opam hierarchy, repository and switch states. diff --git a/opam.opam b/opam.opam index ee10e388e50..1e9f15a5c87 100644 --- a/opam.opam +++ b/opam.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "2.2.0" +version: "2.2.1" synopsis: "Meta-package for Dune" maintainer: "opam-devel@lists.ocaml.org" authors: [