test ocaml 5.4

Author: kit-ty-kate

.github/workflows/ci.ml

@@ -14,11 +14,11 @@
 open Lib
 
 let latest_ocaml4 = "4.14.2"
-let latest_ocaml5 = "5.3.0" (* Add this number to ocamls below when the next version comes out *)
+let latest_ocaml5 = "5.4.0-beta2" (* Add this number to ocamls below when the next version comes out *)
 let ocamls = [
   (* Fully supported versions *)
   "4.08.1"; "4.09.1"; "4.10.2"; "4.11.2"; "4.12.1"; "4.13.1";
-  "5.0.0"; "5.1.1"; "5.2.1";
+  "5.0.0"; "5.1.1"; "5.2.1"; "5.3.0";
 
   (* The last elements of the list after 4.14 will be used as default versions *)
   latest_ocaml4; latest_ocaml5;
@@ -315,7 +315,7 @@ let main_build_job ~analyse_job ~cygwin_job ?section runner start_version ~oc ~w
           "x86_64-pc-windows"
         ] in
         let ocaml5 = [
-          (* "x86_64-pc-cygwin"; *) (* TODO: Restore Cygwin + OCaml 5.3 when C++ support is fixed and released *)
+          "x86_64-pc-cygwin";
           "x86_64-w64-mingw32";
           "x86_64-pc-windows";
         ] in

.github/workflows/main.yml

@@ -106,7 +106,7 @@ jobs:
     needs: Analyse
     strategy:
       matrix:
-        ocamlv: [ 4.08.1, 4.09.1, 4.10.2, 4.11.2, 4.12.1, 4.13.1, 5.0.0, 5.1.1, 5.2.1, 4.14.2, 5.3.0 ]
+        ocamlv: [ 4.08.1, 4.09.1, 4.10.2, 4.11.2, 4.12.1, 4.13.1, 5.0.0, 5.1.1, 5.2.1, 5.3.0, 4.14.2, 5.4.0-beta2 ]
       fail-fast: true
     steps:
     - name: Install bubblewrap
@@ -159,12 +159,15 @@ jobs:
           - host: x86_64-pc-windows
             build: x86_64-pc-cygwin
             ocamlv: 4.14.2
+          - host: x86_64-pc-cygwin
+            build: x86_64-pc-cygwin
+            ocamlv: 5.4.0-beta2
           - host: x86_64-w64-mingw32
             build: x86_64-pc-cygwin
-            ocamlv: 5.3.0
+            ocamlv: 5.4.0-beta2
           - host: x86_64-pc-windows
             build: x86_64-pc-cygwin
-            ocamlv: 5.3.0
+            ocamlv: 5.4.0-beta2
       fail-fast: false
     defaults:
       run:
@@ -250,7 +253,7 @@ jobs:
     needs: Analyse
     strategy:
       matrix:
-        ocamlv: [ 4.14.2, 5.3.0 ]
+        ocamlv: [ 4.14.2, 5.4.0-beta2 ]
       fail-fast: true
     steps:
     - name: Install GNU patch
@@ -288,7 +291,7 @@ jobs:
     needs: [ Analyse, Build-Linux ]
     strategy:
       matrix:
-        ocamlv: [ 4.14.2, 5.3.0 ]
+        ocamlv: [ 4.14.2, 5.4.0-beta2 ]
       fail-fast: false
     env:
       OPAM_TEST: 1
@@ -345,7 +348,7 @@ jobs:
     needs: Analyse
     strategy:
       matrix:
-        ocamlv: [ 4.14.2, 5.3.0 ]
+        ocamlv: [ 4.14.2, 5.4.0-beta2 ]
       fail-fast: false
     env:
       OPAM_TEST: 1
@@ -434,7 +437,7 @@ jobs:
     needs: [ Analyse, Build-Linux ]
     strategy:
       matrix:
-        ocamlv: [ 4.14.2, 5.3.0 ]
+        ocamlv: [ 4.14.2, 5.4.0-beta2 ]
       fail-fast: false
     env:
       OPAM_DOC: 1
@@ -491,7 +494,7 @@ jobs:
     strategy:
       matrix:
         solver: [ z3, 0install ]
-        ocamlv: [ 4.14.2, 5.3.0 ]
+        ocamlv: [ 4.14.2, 5.4.0-beta2 ]
       fail-fast: false
     env:
       SOLVER: ${{ matrix.solver }}
@@ -541,7 +544,7 @@ jobs:
     strategy:
       matrix:
         solver: [ z3, 0install ]
-        ocamlv: [ 4.14.2, 5.3.0 ]
+        ocamlv: [ 4.14.2, 5.4.0-beta2 ]
       fail-fast: false
     env:
       SOLVER: ${{ matrix.solver }}
@@ -589,7 +592,7 @@ jobs:
     needs: [ Analyse, Build-Linux ]
     strategy:
       matrix:
-        ocamlv: [ 4.14.2, 5.3.0 ]
+        ocamlv: [ 4.14.2, 5.4.0-beta2 ]
       fail-fast: false
     steps:
     - name: Install bubblewrap
@@ -624,7 +627,7 @@ jobs:
     needs: [ Analyse, Build-macOS ]
     strategy:
       matrix:
-        ocamlv: [ 4.14.2, 5.3.0 ]
+        ocamlv: [ 4.14.2, 5.4.0-beta2 ]
       fail-fast: false
     steps:
     - name: Checkout tree
@@ -694,7 +697,7 @@ jobs:
     needs: [ Analyse, Build-Linux ]
     strategy:
       matrix:
-        ocamlv: [ 4.14.2, 5.3.0 ]
+        ocamlv: [ 4.14.2, 5.4.0-beta2 ]
       fail-fast: false
     env:
       OPAM_DEPENDS: 1