fixup

kit-ty-kate · Sep 25, 2024 · 86e4328 · 86e4328
1 parent d6f9a7c
commit 86e4328
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/.github/scripts/main/ocaml-cache.sh b/.github/scripts/main/ocaml-cache.sh
@@ -46,7 +46,7 @@ esac
 
 FLEXDLL_VERSION=0.43
 
-curl -sLO "https://github.com/ocaml/ocaml/archive/${OCAML_VERSION}.tar.gz"
+curl -sLO "https://github.com/ocaml/ocaml/archive/refs/tags/${OCAML_VERSION}.tar.gz"
 if [[ $PLATFORM = 'Windows' ]] ; then
   curl -sLO "https://github.com/ocaml/flexdll/archive/refs/tags/$FLEXDLL_VERSION.tar.gz"
 fi

diff --git a/.github/workflows/ci.ml b/.github/workflows/ci.ml
@@ -17,8 +17,8 @@ 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.0";
-   "4.14.1"; "5.3"; (* The last elements of the list after 4.14 be
-                       used as default versions *)
+   "4.14.1"; "5.3.0-alpha1"; (* 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
@@ -302,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"; "x86_64-w64-mingw32"; "x86_64-pc-windows"]) ::
+      (("host", ["x86_64-pc-cygwin"; "i686-w64-mingw32"; "x86_64-w64-mingw32"; "i686-pc-windows"; "x86_64-pc-windows"]) ::
        ("build", ["x86_64-pc-cygwin"]) ::
        matrix, [])
     else

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