Merge pull request #6670 from kit-ty-kate/ocaml-5.5

Add support for OCaml 5.5

Author: rjbou

.github/workflows/ci.ml

@@ -337,6 +337,7 @@ let main_build_job ~analyse_job ~cygwin_job ?section runner start_version ~oc ~w
   let matrix = ((platform <> Windows), matrix, includes) in
   let needs = if platform = Windows then [analyse_job; cygwin_job] else [analyse_job] in
   let host = host_of_platform platform in
+  let continue_on_error_trunk = Printf.sprintf "${{ matrix.ocamlv == '%s' }}" trunk in
   job ~oc ~workflow ~runs_on:(Runner [runner]) ?shell ?section ~needs ~matrix ("Build-" ^ name_of_platform platform)
     ++ only_on Linux (run "Install bubblewrap" ["sudo apt install bubblewrap"])
     ++ only_on Linux (run "Disable AppArmor" ["echo 0 | sudo tee /proc/sys/kernel/apparmor_restrict_unprivileged_userns"])
@@ -349,8 +350,8 @@ let main_build_job ~analyse_job ~cygwin_job ?section runner start_version ~oc ~w
     ++ only_on Windows (unpack_cygwin "${{ matrix.build }}" "${{ matrix.host }}")
     ++ only_on Windows (run "Cygwin info" ["uname -a"])
     ++ build_cache OCaml platform "${{ matrix.ocamlv }}" host
-    ++ run ~id:"build" ~continue_on_error:(Printf.sprintf "${{ matrix.ocamlv == '%s' }}" trunk) "Build" ["bash -exu .github/scripts/main/main.sh " ^ host]
-    ++ not_on Windows (run ~cond:(Predicate(false, Compare("steps.build.outcome", "failure"))) "Test (basic)" ["bash -exu .github/scripts/main/test.sh"])
+    ++ run ~id:"build" ~continue_on_error:continue_on_error_trunk "Build" ["bash -exu .github/scripts/main/main.sh " ^ host]
+    ++ not_on Windows (run ~continue_on_error:continue_on_error_trunk ~cond:(Predicate(false, Compare("steps.build.outcome", "failure"))) "Test (basic)" ["bash -exu .github/scripts/main/test.sh"])
     ++ only_on Windows (run ~cond:(Predicate(false, EndsWith("matrix.host", "-pc-cygwin"))) "Test \"static\" binaries on Windows" ["ldd ./opam.exe | test \"$(grep -v -F /cygdrive/c/Windows/)\" = ''"])
     ++ only_on Windows
       (uses "Upload opam binaries for Windows"

.github/workflows/main.yml

@@ -138,6 +138,7 @@ jobs:
       continue-on-error: ${{ matrix.ocamlv == 'trunk' }}
       run: bash -exu .github/scripts/main/main.sh x86_64-pc-linux-gnu
     - name: Test (basic)
+      continue-on-error: ${{ matrix.ocamlv == 'trunk' }}
       if: steps.build.outcome != 'failure'
       run: bash -exu .github/scripts/main/test.sh
 
@@ -289,6 +290,7 @@ jobs:
       continue-on-error: ${{ matrix.ocamlv == 'trunk' }}
       run: bash -exu .github/scripts/main/main.sh x86_64-apple-darwin
     - name: Test (basic)
+      continue-on-error: ${{ matrix.ocamlv == 'trunk' }}
       if: steps.build.outcome != 'failure'
       run: bash -exu .github/scripts/main/test.sh
 

master_changes.md

@@ -76,6 +76,7 @@ users)
 ## Build
   * opam no longer depends on `cmdliner` [#6755 @kit-ty-kate - fix #6425]
   * Clean variables before calling make on different projects to avoid clashes [#6769 @kit-ty-kate]
+  * Add the upcoming OCaml 5.5 (trunk) support when using dune's dev profile [#6670 @kit-ty-kate]
 
 ## Infrastructure
 
@@ -119,6 +120,7 @@ users)
 ## Github Actions
   * Add OCaml 5.4 to the test matrix [#6732 @kit-ty-kate]
   * Ensure `curl`'s exit status to be non-zero on failure [#6684 @kit-ty-kate]
+  * Add OCaml trunk to the test matrix [#6684 #6670 @kit-ty-kate]
 
 ## Doc
 

src/client/opamTreeCommand.ml

@@ -12,8 +12,8 @@
 open OpamTypes
 open OpamStateTypes
 
-type deps
-type revdeps
+type deps = private [`deps]
+type revdeps = private [`revdeps]
 type 'a node =
   | Root of package
   | Dependency : {