!fixup

Co-authored-by: R. Boujbel <[email protected]>

.github/workflows/ci.ml

@@ -303,15 +303,28 @@ let main_build_job ~analyse_job ~cygwin_job ?section runner start_version ~oc ~w
    * versions of OCaml. *)
   let (matrix, includes) =
     if platform = Windows then
-      ([], [
-          [("host", "x86_64-pc-cygwin"); ("build", "x86_64-pc-cygwin"); ("ocamlv", latest_ocaml4)];
-          [("host", "i686-w64-mingw32"); ("build", "x86_64-pc-cygwin"); ("ocamlv", latest_ocaml4)];
-          [("host", "x86_64-w64-mingw32"); ("build", "x86_64-pc-cygwin"); ("ocamlv", latest_ocaml4)];
-          [("host", "x86_64-w64-mingw32"); ("build", "x86_64-pc-cygwin"); ("ocamlv", latest_ocaml5)];
-          [("host", "i686-pc-windows"); ("build", "x86_64-pc-cygwin"); ("ocamlv", latest_ocaml4)];
-          [("host", "x86_64-pc-windows"); ("build", "x86_64-pc-cygwin"); ("ocamlv", latest_ocaml4)];
-          (* [("host", "x86_64-pc-windows"); ("build", "x86_64-pc-cygwin"); ("ocamlv", latest_ocaml5)]; 5.3 needed *)
-        ])
+      let matrix =
+        let ocaml4 = [
+          "x86_64-pc-cygwin";
+          "i686-w64-mingw32";
+          "x86_64-w64-mingw32";
+          "i686-pc-windows";
+          "x86_64-pc-windows"
+        ] in
+        let ocaml5 = [
+          "x86_64-w64-mingw32";
+          (* "x86_64-pc-windows"; 5.3 needed *)
+        ] in
+        let matrix_elem ocamlv hosts =
+          let elem ocaml host =
+            [("host", host); ("build", "x86_64-pc-cygwin"); ("ocamlv", ocaml)]
+          in
+          List.map (elem ocamlv) hosts
+        in
+        matrix_elem latest_ocaml4 ocaml4
+        @ matrix_elem latest_ocaml5 ocaml5
+      in
+      ([], matrix)
     else
       let (_fail_fast, matrix, _) = platform_ocaml_matrix ~fail_fast:true start_version in
       (matrix, []) in