upd

RblSb · Feb 9, 2024 · 08b31b8 · 08b31b8
1 parent 1504d96
commit 08b31b8
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 58 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -449,6 +449,13 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest, macos-14]
+        include:
+          - os: macos-latest
+            OCAML_VERSION: 4.08.1
+            CTYPES: 0.17.1
+          - os: macos-14
+            OCAML_VERSION: 5.1.1
+            CTYPES: 0.21.1
     runs-on: ${{ matrix.os }}
     env:
       PLATFORM: mac
@@ -510,42 +517,16 @@ jobs:
           sudo make && sudo make install
           cd ..
 
-      # - name: Set OCaml 5.1.1
-      #   if: matrix.os == 'macos-14'
-      #   env:
-      #     OCAML_VER: '5.1.1'
-
-      # - name: Set OCaml 4.08.1
-      #   if: matrix.os == 'macos-latest'
-      #   env:
-      #     OCAML_VER: '4.08.1'
-
-
       - name: Install OCaml libraries
-        if: steps.cache-opam.outputs.cache-hit != 'true' && matrix.os == 'macos-latest'
-        run: |
-          set -ex
-          opam init # --disable-sandboxing
-          opam update
-          opam switch create 4.08.1
-          eval $(opam env)
-          opam env
-          opam pin add ctypes 0.17.1 --yes
-          opam pin add haxe . --no-action
-          opam install haxe --deps-only --assume-depexts
-          opam list
-          ocamlopt -v
-
-      - name: Install OCaml libraries (arm)
-        if: steps.cache-opam.outputs.cache-hit != 'true' && matrix.os == 'macos-14'
+        if: steps.cache-opam.outputs.cache-hit != 'true'
         run: |
           set -ex
           opam init # --disable-sandboxing
           opam update
-          opam switch create 5.1.1
+          opam switch create ${{matrix.OCAML_VERSION}}
           eval $(opam env)
           opam env
-          opam pin add ctypes 0.17.1 --yes
+          opam pin add ctypes ${{matrix.CTYPES}} --yes
           opam pin add haxe . --no-action
           opam install haxe --deps-only --assume-depexts
           opam list

diff --git a/extra/github-actions/build-mac.yml b/extra/github-actions/build-mac.yml
@@ -25,42 +25,16 @@
     sudo make && sudo make install
     cd ..
 
-# - name: Set OCaml 5.1.1
-#   if: matrix.os == 'macos-14'
-#   env:
-#     OCAML_VER: '5.1.1'
-
-# - name: Set OCaml 4.08.1
-#   if: matrix.os == 'macos-latest'
-#   env:
-#     OCAML_VER: '4.08.1'
-
-
 - name: Install OCaml libraries
-  if: steps.cache-opam.outputs.cache-hit != 'true' && matrix.os == 'macos-latest'
-  run: |
-    set -ex
-    opam init # --disable-sandboxing
-    opam update
-    opam switch create 4.08.1
-    eval $(opam env)
-    opam env
-    opam pin add ctypes 0.17.1 --yes
-    opam pin add haxe . --no-action
-    opam install haxe --deps-only --assume-depexts
-    opam list
-    ocamlopt -v
-
-- name: Install OCaml libraries (arm)
-  if: steps.cache-opam.outputs.cache-hit != 'true' && matrix.os == 'macos-14'
+  if: steps.cache-opam.outputs.cache-hit != 'true'
   run: |
     set -ex
     opam init # --disable-sandboxing
     opam update
-    opam switch create 5.1.1
+    opam switch create ${{matrix.OCAML_VERSION}}
     eval $(opam env)
     opam env
-    opam pin add ctypes 0.17.1 --yes
+    opam pin add ctypes ${{matrix.CTYPES}} --yes
     opam pin add haxe . --no-action
     opam install haxe --deps-only --assume-depexts
     opam list

diff --git a/extra/github-actions/workflows/main.yml b/extra/github-actions/workflows/main.yml
@@ -309,6 +309,13 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest, macos-14]
+        include:
+          - os: macos-latest
+            OCAML_VERSION: 4.08.1
+            CTYPES: 0.17.1
+          - os: macos-14
+            OCAML_VERSION: 5.1.1
+            CTYPES: 0.21.1
     runs-on: ${{ matrix.os }}
     env:
       PLATFORM: mac