GHA: Use both 4.14 and 5.2 as default version and remove i686 from th…

…e build matrix

.github/workflows/ci.ml

@@ -15,7 +15,10 @@ open Lib
 
 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"; "4.14.1";
+   "4.08.1"; "4.09.1"; "4.10.2"; "4.11.2"; "4.12.1"; "4.13.1";
+   "5.0.0"; "5.1.1";
+   "4.14.1"; "5.2.0"; (* The last elements of the list after 4.14 be used as
+                         default versions *)
 ]
 
 (* Entry point for the workflow. Workflows are specified as continuations where
@@ -65,7 +68,7 @@ let end_workflow ~oc:_ ~workflow:_ = ()
 let ocamls =
   List.map (fun v -> Scanf.sscanf v "%u.%u.%u" (fun major minor _ -> ((major, minor), v))) ocamls
 
-let latest_ocaml = List.fold_left (fun _ (v, _) -> v) (0, 0) ocamls
+let latest_ocaml = (4, 14)
 
 let platform_ocaml_matrix ?(dir=List.drop_while) ~fail_fast start_version =
   (fail_fast,
@@ -299,7 +302,7 @@ let main_build_job ~analyse_job ~cygwin_job ?section runner start_version ~oc ~w
   let (_fail_fast, matrix, _) = platform_ocaml_matrix ~fail_fast:true start_version in
   let (matrix, includes) =
     if platform = Windows then
-      (("host", ["x86_64-pc-cygwin"; "i686-w64-mingw32"; "x86_64-w64-mingw32"; "i686-pc-windows"; "x86_64-pc-windows"]) ::
+      (("host", ["x86_64-pc-cygwin"; "x86_64-w64-mingw32"; "x86_64-pc-windows"]) ::
        ("build", ["x86_64-pc-cygwin"]) ::
        matrix, [])
     else

.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, 4.14.1 ]
+        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, 4.14.1, 5.2.0 ]
       fail-fast: true
     steps:
     - name: Install bubblewrap
@@ -141,9 +141,9 @@ jobs:
     needs: [ Analyse, Cygwin ]
     strategy:
       matrix:
-        host: [ x86_64-pc-cygwin, i686-w64-mingw32, x86_64-w64-mingw32, i686-pc-windows, x86_64-pc-windows ]
+        host: [ x86_64-pc-cygwin, x86_64-w64-mingw32, x86_64-pc-windows ]
         build: [ x86_64-pc-cygwin ]
-        ocamlv: [ 4.14.1 ]
+        ocamlv: [ 4.14.1, 5.2.0 ]
       fail-fast: false
     defaults:
       run:
@@ -226,7 +226,7 @@ jobs:
     needs: Analyse
     strategy:
       matrix:
-        ocamlv: [ 4.14.1 ]
+        ocamlv: [ 4.14.1, 5.2.0 ]
       fail-fast: true
     steps:
     - name: Checkout tree
@@ -262,7 +262,7 @@ jobs:
     needs: [ Analyse, Build-Linux ]
     strategy:
       matrix:
-        ocamlv: [ 4.14.1 ]
+        ocamlv: [ 4.14.1, 5.2.0 ]
       fail-fast: false
     env:
       OPAM_TEST: 1
@@ -316,7 +316,7 @@ jobs:
     needs: Analyse
     strategy:
       matrix:
-        ocamlv: [ 4.14.1 ]
+        ocamlv: [ 4.14.1, 5.2.0 ]
       fail-fast: false
     env:
       OPAM_TEST: 1
@@ -403,7 +403,7 @@ jobs:
     strategy:
       matrix:
         solver: [ z3, 0install ]
-        ocamlv: [ 4.14.1 ]
+        ocamlv: [ 4.14.1, 5.2.0 ]
       fail-fast: false
     env:
       SOLVER: ${{ matrix.solver }}
@@ -451,7 +451,7 @@ jobs:
     strategy:
       matrix:
         solver: [ z3, 0install ]
-        ocamlv: [ 4.14.1 ]
+        ocamlv: [ 4.14.1, 5.2.0 ]
       fail-fast: false
     env:
       SOLVER: ${{ matrix.solver }}
@@ -499,7 +499,7 @@ jobs:
     needs: [ Analyse, Build-Linux ]
     strategy:
       matrix:
-        ocamlv: [ 4.14.1 ]
+        ocamlv: [ 4.14.1, 5.2.0 ]
       fail-fast: false
     steps:
     - name: Install bubblewrap
@@ -532,7 +532,7 @@ jobs:
     needs: [ Analyse, Build-macOS ]
     strategy:
       matrix:
-        ocamlv: [ 4.14.1 ]
+        ocamlv: [ 4.14.1, 5.2.0 ]
       fail-fast: false
     steps:
     - name: Checkout tree

master_changes.md

@@ -225,6 +225,8 @@ users)
   * Update action checkout to v4 [#6081 @rjbou]
   * Update action upload-artifact to v4 [#6081 @rjbou]
   * preamble: Allow local git submodules (ignore CVE-2022-39253) [#6132 @kit-ty-kate]
+  * Use both 4.14 and 5.2 as default version [#6189 @kit-ty-kate]
+  * Remove Windows/i686 from the build matrix [#6189 @kit-ty-kate]
 
 ## Doc
   * Remove the ppa from the installation instructions on Ubuntu [#5988 @kit-ty-kate - fix #5987]