WIP

Author: vouillon

.github/workflows/build.yml

@@ -105,6 +105,16 @@ jobs:
         with:
           node-version: lts/*
 
+      - name: Set-up OCaml ${{ matrix.ocaml-compiler }}
+        uses: ocaml/setup-ocaml@v3
+        with:
+          ocaml-compiler: ${{ matrix.ocaml-compiler }}
+          dune-cache: true
+          opam-pin: false
+
+      - run: opam install conf-pkg-config
+        if: runner.os == 'Windows'
+
       - name: Restore cached binaryen
         id: cache-binaryen
         uses: actions/cache/restore@v4
@@ -129,18 +139,14 @@ jobs:
         if: matrix.os == 'macos-latest' && steps.cache-binaryen.outputs.cache-hit != 'true'
         run: brew install ninja
 
-      - name: Install ninja (Windows)
-        if: matrix.os == 'windows-latest' && steps.cache-binaryen.outputs.cache-hit != 'true'
-        run: choco install ninja
-
       - name: Build binaryen
         if: matrix.os != 'windows-latest' && steps.cache-binaryen.outputs.cache-hit != 'true'
         working-directory: ./binaryen
         run: |
           cmake -G Ninja .
           ninja
 
-      - name: Build binaryen
+      - name: Build binaryen (Windows)
         if: matrix.os == 'windows-latest' && steps.cache-binaryen.outputs.cache-hit != 'true'
         working-directory: ./binaryen
         run: |
@@ -159,51 +165,6 @@ jobs:
         run: |
           echo "$GITHUB_WORKSPACE/binaryen/bin" >> $GITHUB_PATH
 
-      - name: Binaryen DEBUG
-        shell: bash
-        run: |
-          ls -l /d/a/wasm_of_ocaml/wasm_of_ocaml/binaryen/bin
-
-      - name: Binaryen DEBUG
-        shell: bash
-        run: |
-          echo $PATH
-
-      - name: Binaryen DEBUG
-        shell: bash
-        run: |
-          which wasm-merge
-
-      - name: Binaryen DEBUG
-        shell: bash
-        run: |
-          /d/a/wasm_of_ocaml/wasm_of_ocaml/binaryen/bin/wasm-merge.exe --version
-
-      - name: Binaryen DEBUG
-        shell: bash
-        run: |
-          /d/a/wasm_of_ocaml/wasm_of_ocaml/binaryen/bin/wasm-merge --version
-
-      - name: Binaryen DEBUG
-        shell: bash
-        run: |
-          wasm-merge --version
-
-      - name: Binaryen DEBUG
-        shell: bash
-        run: |
-          wasm-merge --version | grep 'version \(11[89]\|1[2-9][0-9]\)'
-
-      - name: Set-up OCaml ${{ matrix.ocaml-compiler }}
-        uses: ocaml/setup-ocaml@v3
-        with:
-          ocaml-compiler: ${{ matrix.ocaml-compiler }}
-          dune-cache: true
-          opam-pin: false
-
-      - run: opam install conf-pkg-config
-        if: runner.os == 'Windows'
-
       - name: Install faked binaryen-bin package
         # It's faster to use a cached version
         run: opam install --fake binaryen-bin