Merge pull request #95 from ocaml-wasm/ci-mac

CI: test with OCaml 5.01, 5.02 and under MacOS

Author: vouillon

.github/workflows/build-wasm_of_ocaml.yml

@@ -18,6 +18,11 @@ jobs:
         ocaml-compiler:
           - 4.14.x
           - 5.00.x
+          - 5.01.x
+          - 5.02.x
+        include:
+          - os: macos-latest
+            ocaml-compiler: 5.02.x
 
     runs-on: ${{ matrix.os }}
 
@@ -49,10 +54,14 @@ jobs:
           submodules: true
           ref: version_118
 
-      - name: Install ninja
-        if: steps.cache-binaryen.outputs.cache-hit != 'true'
+      - name: Install ninja (Ubuntu)
+        if: matrix.os == 'ubuntu-latest' && steps.cache-binaryen.outputs.cache-hit != 'true'
         run: sudo apt-get install ninja-build
 
+      - name: Install ninja (MacOS)
+        if: matrix.os == 'macos-latest' && steps.cache-binaryen.outputs.cache-hit != 'true'
+        run: brew install ninja
+
       - name: Build binaryen
         if: steps.cache-binaryen.outputs.cache-hit != 'true'
         working-directory: ./binaryen
@@ -79,6 +88,7 @@ jobs:
             ~/.opam
             _opam
             /opt/hostedtoolcache/opam
+            /Users/runner/hostedtoolcache/opam
           key: ${{ runner.os }}-ocaml-${{ matrix.ocaml-compiler }}
 
       - name: Install OCaml ${{ matrix.ocaml-compiler }}
@@ -90,14 +100,20 @@ jobs:
           opam-depext: true
           opam-depext-flags: --with-test
 
-      - name: Install packages
-        if: steps.cache-ocaml.outputs.cache-hit
+      - name: Install packages (Ubuntu)
+        if: matrix.os == 'ubuntu-latest' && steps.cache-ocaml.outputs.cache-hit
         run: sudo apt-get install bubblewrap
 
+      - name: Install packages (MacOs)
+        if: matrix.os == 'macos-latest' && steps.cache-ocaml.outputs.cache-hit
+        # for graphics
+        run: brew install xquartz
+
       - name: Set opam path
         if: steps.cache-ocaml.outputs.cache-hit
         run: |
           echo /opt/hostedtoolcache/opam/*/x86_64 >> $GITHUB_PATH
+          echo /Users/runner/hostedtoolcache/opam/*/arm64 >> $GITHUB_PATH
 
       - name: Cache OCaml
         if: steps.cache-ocaml.outputs.cache-hit != 'true'
@@ -107,6 +123,7 @@ jobs:
             ~/.opam
             _opam
             /opt/hostedtoolcache/opam
+            /Users/runner/hostedtoolcache/opam
           key: ${{ runner.os }}-ocaml-${{ matrix.ocaml-compiler }}
 
       - name: Checkout code

compiler/tests-ocaml/lib-digest/dune

@@ -22,14 +22,20 @@
  (names digests)
  (libraries)
  (enabled_if
-  (>= %{ocaml_version} 5.2))
+  (and
+   (>= %{ocaml_version} 5.2)
+   (<> %{profile} wasm)
+   (<> %{profile} wasm-effects)))
  (modules digests)
  (modes js))
 
 (rule
  (alias runtest)
  (deps digests.bc.js)
  (enabled_if
-  (>= %{ocaml_version} 5.2))
+  (and
+   (>= %{ocaml_version} 5.2)
+   (<> %{profile} wasm)
+   (<> %{profile} wasm-effects)))
  (action
   (run node ./digests.bc.js)))

ppx/ppx_deriving_json/tests/dune

@@ -27,15 +27,21 @@
 (rule
  (alias runtest)
  (enabled_if
-  (>= %{ocaml_version} 5.1))
+  (and
+   (>= %{ocaml_version} 5.1)
+   (<> %{profile} wasm)
+   (<> %{profile} wasm-effects)))
  ;; (package js_of_ocaml-ppx)
  (action
   (diff ppx.mlt ppx.mlt.corrected)))
 
 (rule
  (alias runtest)
  (enabled_if
-  (>= %{ocaml_version} 5.1))
+  (and
+   (>= %{ocaml_version} 5.1)
+   (<> %{profile} wasm)
+   (<> %{profile} wasm-effects)))
  ;; (package js_of_ocaml-ppx)
  (action
   (diff gen.mlt gen.mlt.corrected)))

runtime/wasm/dune

@@ -13,7 +13,7 @@
 
 (rule
  (target version-dependent.wat)
- (deps version-dependent/post-5.2.wat)
+ (deps version-dependent/post-5.1.wat)
  (enabled_if
   (and
    (>= %{ocaml_version} 5.1.0)

tools/node_wrapper.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 export PATH=$(echo $PATH | cut -d : -f 2-) # Do not call oneself recursively
-exec node --experimental-wasm-imported-strings --experimental-wasm-stack-switching --stack-size=7000 "$@"
+exec node --experimental-wasm-imported-strings --experimental-wasm-stack-switching --stack-size=10000 "$@"