Skip to content

Commit e16a04e

Browse files
kit-ty-katekit-ty-kate
authored
Merge pull request #6236 from kit-ty-kate/rel-2.3.0-beta1
Release 2.3.0~beta1
2 parents 3a10cfc + 47e68c4 commit e16a04e

12 files changed

+66
-50
lines changed

‎CHANGES‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,47 @@ repositories (changes that are automatically handled by the format upgrade tools
33
are not marked). Those prefixed with "(+)" are new command/option (since
44
2.1.0~alpha2).
55

6+
2.3.0~beta1:
7+
* Fix an opam 2.1 regression where the initial pin of a local VCS directory
8+
would store untracked and ignored files. Those files would usually be
9+
cleaned before building the package, however git submodules would not be
10+
cleaned and would cause issues when paired with the new behaviour added in
11+
2.3.0~alpha1 which makes opam error when git submodules fail to update
12+
(was previously a warning) [#6221 @rjbou - fix #5809]
13+
* Fix a regression which would make opam crash on platforms where
14+
`getconf LONG_BIT` is not available (e.g. OpenBSD)
15+
[#6230 @kit-ty-kate - fix #6215]
16+
* Fix the installed packages internal cache, which was storing the wrong
17+
version of the opam file after a build failure. This could be triggered
18+
easily for users with custom repositories with non-populated extra-files
19+
[#6213 @kit-ty-kate]
20+
* Fix a regression in lint W59 with local urls that are not archives
21+
[#6219 @rjbou - fix #6218]
22+
* Bump to lang dune to 2.8 and bump the requirement to dune >= 2.8, which was
23+
actually required in the previous alpha release [#6204 @kit-ty-kate]
24+
* Bump the vendored version of dune to 3.16.0, cppo to 1.7.0 and extlib to 1.8.0
25+
[#6223 @kit-ty-kate]
26+
* Fix compilation with OCaml 5.3 when using the vendored extlib by updating to
27+
the 5.3 compatible version [#6223 @kit-ty-kate]
28+
* Fix the compilation of opam on Windows with OCaml >= 5.0 (again)
29+
[#6216 @kit-ty-kate]
30+
* Fix the release script after the bump to dune lang 2.6 and the introduction of
31+
`opam_core_stubs` [#6204 @kit-ty-kate]
32+
* Improve the release script by ignoring interactive questions asked by the
33+
FreeBSD package manager [#6204 @kit-ty-kate]
34+
* Improve and extend the tests [#6135 #6221 #6213 #6219 @rjbou]
35+
* Improve the test infrastructure [#6233 #6233 #6216 @rjbou @kit-ty-kate]
36+
* API changes
37+
* `OpamStd.Sys.{get_terminal_columns,uname,getconf,guess_shell_compat}`:
38+
Harden the process calls to account for failures
39+
[#6230 @kit-ty-kate - fix #6215]
40+
* `OpamStd.Sys.{uname,getconf}`: now accepts only one argument as parameter,
41+
as per their documentation [#6230 @kit-ty-kate]
42+
* `OpamSwitchState.Installed_cache`: export `load` function [#6233 @rjbou]
43+
* `OpamSystem`: add `is_archive_from_string` that does the same than
44+
`is_archive` but without looking at the file, only analysing the string
45+
(extension) [#6219 @rjbou]
46+
647
2.3.0~alpha1:
748
* (*) When loading a repository, don't automatically populate `extra-files:`
849
field with found files in `files/` [#5564 @rjbou]

‎configure‎

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎configure.ac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl The line below must be formatted AC_INIT([opam],[VERSION]) with no extra spaces
2-
AC_INIT([opam],[2.3.0~alpha2~dev])
2+
AC_INIT([opam],[2.3.0~beta1])
33
AC_COPYRIGHT(Copyright 2012-2019 OcamlPro SAS)
44

55
AC_CONFIG_MACRO_DIR([m4])

‎master_changes.md‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ moved, etc.), please update the _API updates_ part (it helps opam library
1111
users)
1212

1313
## Version
14-
* Bump the version of opam to 2.3.0~alpha2~dev [#6204 @kit-ty-kate]
1514

1615
## Global CLI
1716

@@ -22,7 +21,6 @@ users)
2221
## Config report
2322

2423
## Actions
25-
* Fix the install cache storing the wrong version of the opam file after a build failure [#6213 @kit-ty-kate]
2624

2725
## Install
2826

@@ -35,7 +33,6 @@ users)
3533
## Config
3634

3735
## Pin
38-
* [BUG] Fix first retrieval of local VCS pin done as local path [#6221 @rjbou - fix #5809]
3936

4037
## List
4138

@@ -52,7 +49,6 @@ users)
5249
## Source
5350

5451
## Lint
55-
* [BUG] fix lint W59 with local urls that are not archives [#6219 @rjbou - fix #6218]
5652

5753
## Repository
5854

@@ -73,17 +69,10 @@ users)
7369
## VCS
7470

7571
## Build
76-
* Bump the requirement for dune to 2.8 [#6204 @kit-ty-kate]
77-
* 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]
78-
* 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]
79-
* Fix the compilation of opam on Windows with OCaml >= 5.0 again [#6216 @kit-ty-kate]
8072

8173
## Infrastructure
8274

8375
## Release scripts
84-
* Fix the release script after the bump of dune lang to 2.6 [#6204 @kit-ty-kate]
85-
* Fix the release script after the introduction of opam\_core\_stubs [#6204 @kit-ty-kate]
86-
* Improve the release script by ignoring interactive questions asked by the FreeBSD package manager [#6204 @kit-ty-kate]
8776

8877
## Install script
8978

@@ -111,20 +100,10 @@ users)
111100

112101
## Reftests
113102
### Tests
114-
* Move pin test to pin-legacy [#6135 @rjbou]
115-
* More exhaustive test for pin command: test different behaviour and cli options [#6135 @rjbou]
116-
* pin: add a test for erroneous first fetch done as local path on local VCS pinned packages [#6221 @rjbou]
117-
* Add cache test for installed packages cache update after an action failure [#6213 @kit-ty-kate @rjbou]
118-
* Add more tests for lint W59 [#6219 @rjbou]
119103

120104
### Engine
121-
* Update print file function [#6233 @rjbou]
122-
* Add `opam-cache` command, to display internal cache content in reftest [#6233 @rjbou]
123105

124106
## Github Actions
125-
* Add OCaml 5.2.0 to the build matrix [#6216 @kit-ty-kate]
126-
* 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]
127-
* Bump 4.14 to the latest patch version (4.14.2) [#6216 @kit-ty-kate]
128107

129108
## Doc
130109

@@ -136,13 +115,9 @@ users)
136115
## opam-repository
137116

138117
## opam-state
139-
* `OpamSwitchState.Installed_cache`: export `load` function [#6233 @rjbou]
140118

141119
## opam-solver
142120

143121
## opam-format
144122

145123
## opam-core
146-
* `OpamStd.Sys.{get_terminal_columns,uname,getconf,guess_shell_compat}`: Harden the process calls to account for failures [#6230 @kit-ty-kate - fix #6215]
147-
* `OpamStd.Sys.{uname,getconf}`: now accepts only one argument as parameter, as per their documentation [#6230 @kit-ty-kate]
148-
* `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]

‎opam-client.opam‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
opam-version: "2.0"
2-
version: "2.3.0~alpha2~dev"
3-
synopsis: "Client library for opam 2.2"
2+
version: "2.3.0~beta1"
3+
synopsis: "Client library for opam 2.3"
44
description: """
55
Actions on the opam root, switches, installations, and front-end.
66
"""

‎opam-core.opam‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
opam-version: "2.0"
2-
version: "2.3.0~alpha2~dev"
3-
synopsis: "Core library for opam 2.2"
2+
version: "2.3.0~beta1"
3+
synopsis: "Core library for opam 2.3"
44
description:
55
"Small standard library extensions, and generic system interaction modules used by opam."
66
maintainer: "opam-devel@lists.ocaml.org"

‎opam-devel.opam‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
opam-version: "2.0"
2-
version: "2.3.0~alpha2~dev"
3-
synopsis: "Bootstrapped development binary for opam 2.2"
2+
version: "2.3.0~beta1"
3+
synopsis: "Bootstrapped development binary for opam 2.3"
44
description: """
55
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.
66
"""

‎opam-format.opam‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
opam-version: "2.0"
2-
version: "2.3.0~alpha2~dev"
3-
synopsis: "Format library for opam 2.2"
2+
version: "2.3.0~beta1"
3+
synopsis: "Format library for opam 2.3"
44
description: """
55
Definition of opam datastructures and its file interface.
66
"""

‎opam-installer.opam‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
opam-version: "2.0"
2-
version: "2.3.0~alpha2~dev"
2+
version: "2.3.0~beta1"
33
synopsis: "Installation of files to a prefix, following opam conventions"
44
description: """
55
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.

‎opam-repository.opam‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
opam-version: "2.0"
2-
version: "2.3.0~alpha2~dev"
3-
synopsis: "Repository library for opam 2.2"
2+
version: "2.3.0~beta1"
3+
synopsis: "Repository library for opam 2.3"
44
description: """
55
This library includes repository and remote sources handling, including curl/wget, rsync, git, mercurial, darcs backends.
66
"""

0 commit comments

Comments
 (0)