Merge pull request #5611 from rjbou/22alpha2

Updates for 2.2.0~alpha2 release
ocaml · Jul 24, 2023 · a2638a5 · a2638a5
2 parents 22b9c38 + f3d2e9b
commit a2638a5
Show file tree

Hide file tree

Showing 13 changed files with 41 additions and 48 deletions.
diff --git a/CHANGES b/CHANGES
@@ -3,6 +3,28 @@ 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.0~alpha2:
+* Permit internal Cygwin install on Windows [#5545 @rjbou @dra27]
+* Add `--no-cygwin-setup`, `--cygwin-internal-install`,
+  `--cygwin-local-install` and `--cygwin-location <path>` experimental flags
+  available only on Windows to permit non-interactive Cygwin configuration
+  [#5545 @rjbou]
+* opam var/option: Error with more accurate message in case of package/self
+  variable wrongly given as argument [#4903 @rjbou - fix #4489]
+* [BUG] opam var/option: Handle package variable syntax in parse update
+  regexp [#4903 @rjbou - fix #4489]
+* Lint: E29: The conflicts field's filter does not support package variables
+  [#5535 @kit-ty-kate]
+* opam admin: On linting, clean output when stdout is not tty [#5594 @rjbou]
+* Run autoupdate to silence autogen warnings [#5555 @MisterDA]
+* Update bootstrap to use FlexDLL 0.43 from ocaml/flexdll [#5579 @MisterDA]
+* configure: Ensure a complementary (32bit on 64bit platforms and 64bit on
+  32bit platforms) C compiler is installed on Windows [#5522 @kit-ty-kate]
+* Bump versions, fix authors [#5603 #5609 #5611 @rjbou]
+* Improve and extended tests: [#5385 #5535 @rjbou]
+* Improve test engine: [#5481 @dra27]
+* Improve Github actions: [#5555 #5588 #5598 @rjbou]
+
 2.2.0~alpha:
 * Depexts support Cygwin on Windows [#5542 @rjbou] [#5544 @rjbou]
   [#5541 @dra27]

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~alpha2~dev])
+AC_INIT([opam],[2.2.0~alpha2])
 AC_COPYRIGHT(Copyright 2012-2019 OcamlPro SAS)
 
 AC_CONFIG_MACRO_DIR([m4])

diff --git a/master_changes.md b/master_changes.md
@@ -11,17 +11,12 @@ moved, etc.), please update the _API updates_ part (it helps opam library
 users)
 
 ## Version
-  * Bump to 2.2.0~alpha2~dev [#5603 @rjbou]
-  * Update Kate email [#5609 @rjbou]
-  * Fix author heading in manpage [#5609 @rjbou]
 
 ## Global CLI
 
 ## Plugins
 
 ## Init
-  * Permit internal Cygwin install on Windows [#5545 @rjbou @dra27]
-  * Add `--no-cygwin-setup`, `--cygwin-internal-install`, `--cygwin-local-install` and `--cygwin-location <path>` experimental flags available only on Windows to permit non-interactive Cygwin configuration [#5545 @rjbou]
 
 ## Config report
 
@@ -42,8 +37,6 @@ users)
 ## Show
 
 ## Var/Option
-  * Handle package variable syntax in parse update regexp [#4903 @rjbou - fix #4489]
-  * Error with more accurate message in case of package/self variable wrongly given as argument [#4903 @rjbou - fix #4489]
 
 ## Update / Upgrade
 
@@ -52,7 +45,6 @@ users)
 ## Source
 
 ## Lint
-  * E29: The conflicts field's filter does not support package variables [#5535 @kit-ty-kate]
 
 ## Repository
 
@@ -71,16 +63,12 @@ users)
 ## VCS
 
 ## Build
-  * Run autoupdate to silence autogen warnings [#5555 @MisterDA]
-  * Update bootstrap to use FlexDLL 0.43 from ocaml/flexdll [#5579 @MisterDA]
-  * configure: Ensure a complementary (32bit on 64bit platforms and 64bit on 32bit platforms) C compiler is installed on Windows [#5522 @kit-ty-kate]
 
 ## Infrastructure
 
 ## Release scripts
 
 ## Admin
-  * When linting, clean output when stdout is not tty [#5594 @rjbou]
 
 ## Opam installer
 
@@ -102,41 +90,24 @@ users)
 
 ## Reftests
 ### Tests
-  * Detect change in root version when switching branches and re-build test roots [#5481 @dra27]
-  * Admin: add a full test [#5385 @rjbou]
-  * Lint
-    * E29: Add conflicts test and simplify W41 to no more trigger E29 [#5535 @rjbou]
 
 ### Engine
 
 ## Github Actions
-  * Fix hygiene scripts for install check: it was missing a conversion `~` -> `-` for dev version [#5588 @rjbou]
-  * Add configure autoupdate test [#5555 @rjbou]
-  * Fix cli version master check, introduced by #5555 [#5598 @rjbou]
 
 ## Doc
 
 ## Security fixes
 
 # API updates
 ## opam-client
-  * `OpaminitDefault`: add `required_packages_for_cygwin` packages tool list [#5545 @rjbou]
-  * `OpamClient.init`: now propose to install internal Cygwin install [#5545 @rjbou]
-  * `OpamSolution.get_depext`: do not confirm in case of internal Cygwin install [#5545 @rjbou]
-  * `OpamClient.init`: add optional `cygwin_setup` argument to permit non interactive setup [#5545 @rjbou]
-  * `OpamCommands.init`: add cygwin setup flags [#5545 @rjbou]
 
 ## opam-repository
 
 ## opam-state
-  * `OpamSysinteract.Cygwin`: add `install` that performs a Cygwin install in opam internals [#5545 @rjbou @dra27]
-  * `OpamSysInteract.Cygwin`: add `is_internal` [#5545 @rjbou]
-  * `OpamSysInteract.install`: on Cygwin, upgrade automatically packages, and select local cache [#5545 @rjbou]
 
 ## opam-solver
 
 ## opam-format
 
 ## opam-core
-  * `OpamConsole.carriage_delete`: no-op when not tty out [#5595 @rjbou]
-  * `OpamSystem.make_command`: Remove the warning triggered when the command contained spaces [#5596 @rjbou - fix #5163]
diff --git a/opam-client.opam b/opam-client.opam
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.2.0~alpha2~dev"
+version: "2.2.0~alpha2"
 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~alpha2~dev"
+version: "2.2.0~alpha2"
 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~alpha2~dev"
+version: "2.2.0~alpha2"
 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~alpha2~dev"
+version: "2.2.0~alpha2"
 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~alpha2~dev"
+version: "2.2.0~alpha2"
 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~alpha2~dev"
+version: "2.2.0~alpha2"
 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~alpha2~dev"
+version: "2.2.0~alpha2"
 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~alpha2~dev"
+version: "2.2.0~alpha2"
 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~alpha2~dev"
+version: "2.2.0~alpha2"
 synopsis: "Meta-package for Dune"
 maintainer: "opam-devel@lists.ocaml.org"
 authors: [