Update the changelog, GHA and documentation after the release of opam 2.5.0

.github/scripts/main/main.sh

@@ -203,7 +203,7 @@ if [ "$OPAM_DEPENDS" = "1" ]; then
   OCAMLVER=$(ocamlc -version)
 
   (set +x; echo -en "::group::depends\r") 2>/dev/null
-  VERSION="2.4.1"
+  VERSION="2.5.0"
   opam_libs=$(opam show . -f name 2>/dev/null)
   depends_on=$(echo "$opam_libs" | sed "s/\$/.${VERSION}/" | paste -sd, -)
   packages=$(echo "$opam_libs" | while read lib; do

.github/scripts/main/preamble.sh

@@ -58,6 +58,7 @@ init-bootstrap () {
     if [ "${OPAM_REPO%.git}" != "${OPAM_REPO_MAIN%.git}" ]; then
       opam init --no-setup git+$OPAM_REPO_MAIN#$REPO_SHA
     else
+      git -C "${OPAM_REPO_CACHE#file://}" fetch origin
       opam init --no-setup git+$OPAM_REPO_CACHE#$REPO_SHA
     fi
 

.github/scripts/main/test.sh

@@ -17,6 +17,7 @@ fi
 # The SHA is fixed so that upstream changes shouldn't affect CI. The SHA needs
 # to be moved forwards when a new version of OCaml is added to ensure that the
 # ocaml-system package is available at the correct version.
+git -C "${OPAM_REPO_CACHE#file://}" fetch origin
 opam init --bare default git+$OPAM_REPO_CACHE#$OPAM_TEST_REPO_SHA
 cat >> $(opam var root --global 2>/dev/null)/config <<EOF
 archive-mirrors: "https://opam.ocaml.org/cache"

.github/workflows/ci.ml

@@ -359,6 +359,7 @@ let main_build_job ~analyse_job ~cygwin_job ?section runner start_version ~oc ~w
           {|if "${{ matrix.host }}" equ "x86_64-pc-windows" call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"|} ::
           {|if "${{ matrix.host }}" equ "i686-pc-windows" call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars32.bat"|} ::
           run_or_fail [
+           {|git -C %cd%/../../../opam-repository fetch origin|};
            {|opam init --yes --bare default git+file://%cd%/../../../opam-repository#${{ env.OPAM_TEST_REPO_SHA }} --no-git-location|};
            {|opam switch --yes create default ocaml-system|};
            {|opam env|};
@@ -553,7 +554,7 @@ let main oc : unit =
     ("OPAM12CACHE", "~/.cache/opam1.2/cache");
     (* These should be identical to the values in appveyor.yml *)
     ("OPAM_REPO", "https://github.com/ocaml/opam-repository.git");
-    ("OPAM_TEST_REPO_SHA", "38a1469dbbc69c770e534e26f79c97256a442b71");
+    ("OPAM_TEST_REPO_SHA", "eb45f7ec868b0ffc828b9d59cccc72cfec100333");
     ("OPAM_REPO_SHA", "38a1469dbbc69c770e534e26f79c97256a442b71");
     ("SOLVER", "");
     (* Cygwin configuration *)

.github/workflows/depexts.yml

@@ -17,9 +17,9 @@ defaults:
     shell: bash
 
 env:
-  OPAMVERSION: 2.4.1
+  OPAMVERSION: 2.5.0
   OPAM_REPO: https://github.com/ocaml/opam-repository.git
-  OPAM_REPO_SHA: 38a1469dbbc69c770e534e26f79c97256a442b71
+  OPAM_REPO_SHA: eb45f7ec868b0ffc828b9d59cccc72cfec100333
 
 jobs:
   opam-cache:

.github/workflows/main.yml

@@ -26,7 +26,7 @@ env:
   OPAMBSROOT: ~/.cache/.opam.cached
   OPAM12CACHE: ~/.cache/opam1.2/cache
   OPAM_REPO: https://github.com/ocaml/opam-repository.git
-  OPAM_TEST_REPO_SHA: 38a1469dbbc69c770e534e26f79c97256a442b71
+  OPAM_TEST_REPO_SHA: eb45f7ec868b0ffc828b9d59cccc72cfec100333
   OPAM_REPO_SHA: 38a1469dbbc69c770e534e26f79c97256a442b71
   SOLVER:
   CYGWIN_MIRROR: http://mirrors.kernel.org/sourceware/cygwin/
@@ -236,6 +236,7 @@ jobs:
         set Path=D:\Cache\ocaml-local\bin;%Path%
         if "${{ matrix.host }}" equ "x86_64-pc-windows" call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
         if "${{ matrix.host }}" equ "i686-pc-windows" call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars32.bat"
+        git -C %cd%/../../../opam-repository fetch origin || exit /b 1
         opam init --yes --bare default git+file://%cd%/../../../opam-repository#${{ env.OPAM_TEST_REPO_SHA }} --no-git-location || exit /b 1
         opam switch --yes create default ocaml-system || exit /b 1
         opam env || exit /b 1

CHANGES

@@ -3,6 +3,12 @@ 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.5.0:
+* (no difference compared to 2.5.0~rc1)
+
+2.5.0~rc1:
+* (no difference compared to 2.5.0~beta1)
+
 2.5.0~beta1:
 * Allow the macOS sandbox to write in the `/var/folders/` and `/var/db/mds/`
   directories as it is required by some of macOS core tools

doc/pages/Install.md

@@ -146,9 +146,9 @@ Sources of the latest stable version of opam are available on Github:
 You can also download the full archives, including opam dependencies (these
 don't require any extra downloads):
 
-* [2.4.1](https://github.com/ocaml/opam/releases/download/2.4.1/opam-full-2.4.1.tar.gz)
- - MD5: 57df5d14234be1ba65ad6acb3a22e860
- - SHA512: 25e0b60c214f94c91780658ce4af149c89549b6d164d07739eca2e8b1c2ea2086e17a64ba486c4a8365fcdf532729848f410f63e3579f2bdd564fc333ab3f787
+* [2.5.0](https://github.com/ocaml/opam/releases/download/2.5.0/opam-full-2.5.0.tar.gz)
+ - MD5: 300a43aca6a20c984100ec6855c2f979
+ - SHA512: 4e47b03e22de3ab975f1e14b4a6b8e98f159a065be8f9d56f110e6a2a5275b42d4646350b230f912b057b768f182225db24d5343da41a716d0e9cdc1cb435c54
 
 Follow the instructions in the included
 [`README.md`](https://github.com/ocaml/opam#readme) to get opam built and

opam-client.opam

@@ -1,6 +1,6 @@
 opam-version: "2.0"
 version: "2.6.0~alpha1~dev"
-synopsis: "Client library for opam 2.4"
+synopsis: "Client library for opam 2.6"
 description: """
 Actions on the opam root, switches, installations, and front-end.
 """

opam-core.opam

@@ -1,6 +1,6 @@
 opam-version: "2.0"
 version: "2.6.0~alpha1~dev"
-synopsis: "Core library for opam 2.4"
+synopsis: "Core library for opam 2.6"
 description:
   "Small standard library extensions, and generic system interaction modules used by opam."
 maintainer: "[email protected]"

opam-devel.opam

@@ -1,6 +1,6 @@
 opam-version: "2.0"
 version: "2.6.0~alpha1~dev"
-synopsis: "Bootstrapped development binary for opam 2.4"
+synopsis: "Bootstrapped development binary for opam 2.6"
 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.
 """

opam-format.opam

@@ -1,6 +1,6 @@
 opam-version: "2.0"
 version: "2.6.0~alpha1~dev"
-synopsis: "Format library for opam 2.4"
+synopsis: "Format library for opam 2.6"
 description: """
 Definition of opam datastructures and its file interface.
 """

opam-repository.opam

@@ -1,6 +1,6 @@
 opam-version: "2.0"
 version: "2.6.0~alpha1~dev"
-synopsis: "Repository library for opam 2.4"
+synopsis: "Repository library for opam 2.6"
 description: """
 This library includes repository and remote sources handling, including curl/wget, rsync, git, mercurial, darcs backends.
 """

opam-solver.opam

@@ -1,6 +1,6 @@
 opam-version: "2.0"
 version: "2.6.0~alpha1~dev"
-synopsis: "Solver library for opam 2.4"
+synopsis: "Solver library for opam 2.6"
 description: """
 Solver and Cudf interaction. This library is based on the Cudf and Dose libraries, and handles calls to the external solver from opam.
 """

opam-state.opam

@@ -1,6 +1,6 @@
 opam-version: "2.0"
 version: "2.6.0~alpha1~dev"
-synopsis: "State library for opam 2.4"
+synopsis: "State library for opam 2.6"
 description: """
 Handling of the ~/.opam hierarchy, repository and switch states.
 """