Skip to content

Commit

Permalink
Merge pull request #6172 from kit-ty-kate/opam-2.2.1
Browse files Browse the repository at this point in the history
Release 2.2.1
  • Loading branch information
kit-ty-kate authored Aug 21, 2024
2 parents 3d5090c + 48d8af3 commit 7b95e1f
Show file tree
Hide file tree
Showing 13 changed files with 37 additions and 43 deletions.
18 changes: 18 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 9 additions & 9 deletions configure

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -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])
Expand Down
24 changes: 0 additions & 24 deletions master_changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand All @@ -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

Expand Down Expand Up @@ -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

Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion opam-client.opam
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion opam-core.opam
Original file line number Diff line number Diff line change
@@ -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."
Expand Down
2 changes: 1 addition & 1 deletion opam-devel.opam
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion opam-format.opam
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion opam-installer.opam
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion opam-repository.opam
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion opam-solver.opam
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion opam-state.opam
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion opam.opam
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
opam-version: "2.0"
version: "2.2.0"
version: "2.2.1"
synopsis: "Meta-package for Dune"
maintainer: "[email protected]"
authors: [
Expand Down

0 comments on commit 7b95e1f

Please sign in to comment.