Merge pull request #6172 from kit-ty-kate/opam-2.2.1

Release 2.2.1
ocaml · Aug 21, 2024 · 7b95e1f · 7b95e1f
2 parents 3d5090c + 48d8af3
commit 7b95e1f
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 43 deletions.
diff --git 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-<version>.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
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.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
@@ -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-<version>.tar.gz archive [#6067 @kit-ty-kate]
-  * Ensure the configure file stays as it is in the tag, in the opam-full-<version>.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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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: [