Bump trunk CI to 5.4.0

This also updates the easier parts of ppxlib to be compatible with 5.4.0.
We will need to version the Location module.

Signed-off-by: Patrick Ferris <[email protected]>

Author: patricoferris

.github/workflows/trunk-build.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Install OCaml compiler
         uses: ocaml/setup-ocaml@v3
         with:
-          ocaml-compiler: 'ocaml-variants.5.3.1+trunk'
+          ocaml-compiler: 'ocaml-variants.5.4.0+trunk'
           dune-cache: true
           cache-prefix: ${{ steps.setup.outputs.cache_prefix }}
 

ast/supported_version/supported_version.ml

@@ -13,6 +13,7 @@ let all =
     (5, 1);
     (5, 2);
     (5, 3);
+    (5, 4);
   ]
 
 let to_string (a, b) =

astlib/config/gen.ml

@@ -29,6 +29,7 @@ let () =
     | 5, 1 -> "501"
     | 5, 2 -> "502"
     | 5, 3 -> "503"
+    | 5, 4 -> "504"
     | _ ->
         Printf.eprintf "Unknown OCaml version %s\n" ocaml_version_str;
         exit 1)

dune-project

@@ -16,7 +16,7 @@
  (depends
 ;; 5.3 support is still experimental, remember to set the upper bound
 ;; to 5.3.0 when cutting a release and then back to 5.4.0 afterwards.
-  (ocaml (and (and (>= 4.08.0) (< 5.4.0))))
+  (ocaml (and (and (>= 4.08.0) (< 5.5.0))))
   (ocaml-compiler-libs (>= v0.11.0))
   (ppx_derivers (>= 1.0))
   (sexplib0 (>= v0.12))

ppxlib.opam

@@ -21,7 +21,7 @@ doc: "https://ocaml-ppx.github.io/ppxlib/"
 bug-reports: "https://github.com/ocaml-ppx/ppxlib/issues"
 depends: [
   "dune" {>= "3.8"}
-  "ocaml" {>= "4.08.0" & < "5.4.0"}
+  "ocaml" {>= "4.08.0" & < "5.5.0"}
   "ocaml-compiler-libs" {>= "v0.11.0"}
   "ppx_derivers" {>= "1.0"}
   "sexplib0" {>= "v0.12"}