Wasm_of_ocaml with alternative dune support

.gitattributes

@@ -1,2 +1,6 @@
 *.ml linguist-language=OCaml
 *.mli linguist-language=OCaml
+
+# We are pinning wasm_of_ocaml using this file in the CI. This would
+# fail on Windows otherwise.
+VERSION -text

.github/workflows/build-wasm_of_ocaml.yml

@@ -0,0 +1,228 @@
+name: Build wasm_of_ocaml
+
+on:
+  pull_request:
+  push:
+
+jobs:
+  build:
+    env:
+      OPAMJOBS: 2
+      OPAMYES: true
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-latest
+        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 }}
+
+    steps:
+      - name: Set git to use LF
+        run: |
+          git config --global core.autocrlf false
+          git config --global core.eol lf
+          git config --global core.ignorecase false
+
+      - name: Install node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+
+      - name: Restore cached binaryen
+        id: cache-binaryen
+        uses: actions/cache/restore@v4
+        with:
+          path: binaryen
+          key: ${{ runner.os }}-binaryen-version_118
+
+      - name: Checkout binaryen
+        if: steps.cache-binaryen.outputs.cache-hit != 'true'
+        uses: actions/checkout@v4
+        with:
+          repository: WebAssembly/binaryen
+          path: binaryen
+          submodules: true
+          ref: version_118
+
+      - 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
+        run: |
+          cmake -G Ninja .
+          ninja
+
+      - name: Cache binaryen
+        if: steps.cache-binaryen.outputs.cache-hit != 'true'
+        uses: actions/cache/save@v4
+        with:
+          path: binaryen
+          key: ${{ runner.os }}-binaryen-version_118
+
+      - name: Set binaryen's path
+        run: |
+          echo "$GITHUB_WORKSPACE/binaryen/bin" >> $GITHUB_PATH
+
+      - name: Restore cached OCaml
+        id: cache-ocaml
+        uses: actions/cache/restore@v4
+        with:
+          path: |
+            ~/.opam
+            _opam
+            /opt/hostedtoolcache/opam
+            /Users/runner/hostedtoolcache/opam
+          key: ${{ runner.os }}-ocaml-${{ matrix.ocaml-compiler }}
+
+      - name: Install OCaml ${{ matrix.ocaml-compiler }}
+        if: steps.cache-ocaml.outputs.cache-hit != 'true'
+        uses: ocaml/setup-ocaml@v3
+        with:
+          ocaml-compiler: ${{ matrix.ocaml-compiler }}
+          dune-cache: true
+          opam-depext: true
+          opam-depext-flags: --with-test
+
+      - 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'
+        uses: actions/cache/save@v4
+        with:
+          path: |
+            ~/.opam
+            _opam
+            /opt/hostedtoolcache/opam
+            /Users/runner/hostedtoolcache/opam
+          key: ${{ runner.os }}-ocaml-${{ matrix.ocaml-compiler }}
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          path: wasm_of_ocaml
+
+      - name: Pin faked binaryen-bin package
+        # It's faster to use a cached version
+        working-directory: ./binaryen
+        run: |
+          echo opam-version: '"2.0"' > binaryen-bin.opam
+          opam pin -n .
+          rm binaryen-bin.opam
+
+      - name: Checkout Jane Street opam repository
+        uses: actions/checkout@v4
+        with:
+          repository: janestreet/opam-repository
+          ref: feaf8f831051fd5f316963b28efd728cf0b0eca1
+          path: jane-street/opam-repository
+
+      - name: Pin dune
+        run: |
+          opam pin add -n dune.3.17 https://github.com/vouillon/dune.git#wasm_of_ocaml-alternative
+
+      - name: Pin wasm_of_ocaml
+        working-directory: ./wasm_of_ocaml
+        run: |
+           for i in *.opam; do opam pin add -n `basename $i .opam`.`< VERSION` .; done
+
+      - name: Install opam file parser
+        run: opam install opam-format ocamlfind dune graphics
+
+      - name: Checkout Jane Street packages
+        run: opam exec -- ocaml wasm_of_ocaml/tools/ci_setup.ml
+
+      - name: Update test dependencies
+        run: opam install num cohttp-lwt-unix ppx_expect cstruct
+
+      - name: Install wasm_of_ocaml
+        working-directory: ./wasm_of_ocaml
+        run: opam install `basename -s .opam *.opam`
+
+      - name: Run tests
+        working-directory: ./wasm_of_ocaml
+        run: opam exec -- dune build @all @runtest --profile wasm
+
+      - name: Run tests with CPS effects
+        if: ${{ matrix.ocaml-compiler >= '5.' }}
+        working-directory: ./wasm_of_ocaml
+        run: opam exec -- dune build @all @runtest --profile wasm-effects
+
+      - name: Run Base tests
+        if: ${{ matrix.ocaml-compiler < '5.' }}
+        working-directory: ./jane-street/lib/base
+        run: opam exec -- dune runtest
+
+      - name: Run Base bigstring tests
+        if: ${{ matrix.ocaml-compiler < '5.' }}
+        working-directory: ./jane-street/lib/base_bigstring
+        run: opam exec -- dune runtest
+
+      - name: Run Core tests
+        if: ${{ matrix.ocaml-compiler < '5.' }}
+        working-directory: ./jane-street/lib/core
+        run: opam exec -- dune runtest
+
+      - name: Run Bignum tests
+        if: ${{ matrix.ocaml-compiler < '5.' }}
+        working-directory: ./jane-street/lib/bignum
+        run: opam exec -- dune runtest
+
+      - name: Run Bin_prot tests
+        if: ${{ matrix.ocaml-compiler < '5.' }}
+        working-directory: ./jane-street/lib/bin_prot
+        run: opam exec -- dune runtest
+
+      - name: Run String_dict tests
+        if: ${{ matrix.ocaml-compiler < '5.' }}
+        working-directory: ./jane-street/lib/string_dict
+        run: opam exec -- dune runtest
+
+      - name: Run Zarith tests
+        if: ${{ matrix.ocaml-compiler < '5.' }}
+        working-directory: ./jane-street/lib/zarith_stubs_js
+        run: opam exec -- dune runtest
+
+      - name: Run Virtual_dom tests
+        if: ${{ matrix.ocaml-compiler < '5.' }}
+        working-directory: ./jane-street/lib/virtual_dom
+        run: opam exec -- dune runtest
+
+      - name: Run Bonsai tests
+        if: ${{ matrix.ocaml-compiler < '5.' }}
+        working-directory: ./jane-street/lib/bonsai
+        run: opam exec -- dune runtest
+
+      - name: Run Bonsai tests (release profile)
+        if: ${{ matrix.ocaml-compiler < '5.' }}
+        working-directory: ./jane-street/lib/bonsai
+        run: opam exec -- dune runtest --profile release

.github/workflows/build.yml

@@ -112,13 +112,31 @@ jobs:
           dune-cache: true
           opam-pin: false
 
+      - name: Pin dune
+        run: |
+          opam pin add dune.3.17 https://github.com/vouillon/dune.git#wasm_of_ocaml-alternative
+
       - run: opam install conf-pkg-config
         if: runner.os == 'Windows'
 
       - run: opam install . --best-effort
         if: ${{ matrix.skip-test }}
 
-      - run: opam install . --with-test
+      - run: cat VERSION | xargs opam pin wasm_of_ocaml-compiler . -n --with-version 
+        if: ${{ !matrix.skip-test }}
+        shell: bash
+
+      - run: opam install conf-c++
+        # Otherwise, the next step fails reinstalling gcc while compiling
+        # other packages
+        if: ${{ !matrix.skip-test && runner.os == 'Windows' }}
+
+      - run: opam install . --with-test --deps-only
+        # Install the test dependencies
+        if: ${{ !matrix.skip-test }}
+
+      - run: opam install .
+        # Install the packages (without running the tests)
         if: ${{ !matrix.skip-test }}
 
       - run: opam exec -- make all
@@ -158,6 +176,9 @@ jobs:
         with:
           ocaml-compiler: "5.2"
           dune-cache: true
+      - name: Pin dune
+        run: |
+          opam pin add -n dune.3.17 https://github.com/vouillon/dune.git#wasm_of_ocaml-alternative
       - uses: ocaml/setup-ocaml/lint-opam@v3
 
   lint-fmt:
@@ -170,6 +191,9 @@ jobs:
         with:
           ocaml-compiler: "5.2"
           dune-cache: true
+      - name: Pin dune
+        run: |
+          opam pin add -n dune.3.17 https://github.com/vouillon/dune.git#wasm_of_ocaml-alternative
       - uses: ocaml/setup-ocaml/lint-fmt@v3
 
   lint-runtime:

.github/workflows/merge.yml

@@ -0,0 +1,39 @@
+name: Automatic Merge with Js_of_ocaml
+
+on:
+  schedule:
+    - cron: '0 0 * * *'  # Executes daily at midnight UTC
+  workflow_dispatch:  # Allows manual triggering of the workflow
+
+permissions:
+  contents: write
+
+jobs:
+  merge:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout this repository
+        uses: actions/checkout@v3
+        with:
+          ref: main
+          fetch-depth: 1000
+
+      - name: Set Git committer identity
+        run: |
+          git config user.name github-actions
+          git config user.email [email protected]
+
+      - name: Fetch js_of_ocaml master
+        run: git fetch https://github.com/ocsigen/js_of_ocaml.git master
+
+      - name: Merge js_of_ocaml master into current repository
+        run: git merge FETCH_HEAD
+
+      - name: Push merged changes to 'jsoo-merged' branch
+        run: |
+          if git show-ref --verify --quiet refs/heads/jsoo-merged; then
+            git branch -D jsoo-merged
+          fi
+          git checkout -b jsoo-merged
+          git push --force origin jsoo-merged