diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8f7f35b87..1a18fc2d1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -88,13 +88,17 @@ jobs: dune-cache: true opam-pin: false + - name: Pin dune + run: | + opam pin add dune.3.17 https://github.com/ocaml-wasm/dune.git#wasm_of_ocaml-incremental + - run: opam install conf-pkg-config if: runner.os == 'Windows' - - run: opam install . --best-effort + - run: opam pin --with-version `< VERSION` . --best-effort if: ${{ matrix.skip-test }} - - run: opam install . --with-test + - run: opam pin --with-version `< VERSION` if: ${{ !matrix.skip-test }} - run: opam exec -- make all @@ -134,6 +138,9 @@ jobs: with: ocaml-compiler: "5.2" dune-cache: true + - name: Pin dune + run: | + opam pin add -n dune.3.17 https://github.com/ocaml-wasm/dune.git#wasm_of_ocaml-incremental - uses: ocaml/setup-ocaml/lint-opam@v3 lint-fmt: @@ -146,6 +153,9 @@ jobs: with: ocaml-compiler: "5.2" dune-cache: true + - name: Pin dune + run: | + opam pin add -n dune.3.17 https://github.com/ocaml-wasm/dune.git#wasm_of_ocaml-incremental - uses: ocaml/setup-ocaml/lint-fmt@v3 lint-runtime: diff --git a/biome.json b/biome.json index 6bcb2055d..32dc645b8 100644 --- a/biome.json +++ b/biome.json @@ -2,7 +2,11 @@ "$schema": "https://biomejs.dev/schemas/1.9.1/schema.json", "files": { "include": ["runtime"], - "ignore": ["runtime/zstd.ts"] + "ignore": [ + "runtime/zstd.ts", + "runtime/wasm/runtime.js", + "runtime/wasm/deps.json" + ] }, "formatter": { "enabled": true, diff --git a/dune-project b/dune-project index f3587b225..2f54a9476 100644 --- a/dune-project +++ b/dune-project @@ -139,7 +139,7 @@ (description "Wasm_of_ocaml is a compiler from OCaml bytecode to WebAssembly. It makes it possible to run pure OCaml programs in JavaScript environment like browsers and Node.js") (depends - (ocaml (and (>= 4.14) (< 5.1))) + (ocaml (and (>= 4.14) (< 5.3))) (js_of_ocaml (= :version)) (num :with-test) (ppx_expect (and (>= v0.14.2) :with-test)) @@ -150,7 +150,8 @@ menhir menhirLib menhirSdk - yojson) + yojson + binaryen-bin) (depopts ocamlfind) (conflicts diff --git a/wasm_of_ocaml-compiler.opam b/wasm_of_ocaml-compiler.opam index e7ffee830..3d1a938bf 100644 --- a/wasm_of_ocaml-compiler.opam +++ b/wasm_of_ocaml-compiler.opam @@ -13,7 +13,7 @@ doc: "https://ocsigen.org/js_of_ocaml/latest/manual/overview" bug-reports: "https://github.com/ocsigen/js_of_ocaml/issues" depends: [ "dune" {>= "3.17"} - "ocaml" {>= "4.14" & < "5.1"} + "ocaml" {>= "4.14" & < "5.3"} "js_of_ocaml" {= version} "num" {with-test} "ppx_expect" {>= "v0.14.2" & with-test} @@ -25,6 +25,7 @@ depends: [ "menhirLib" "menhirSdk" "yojson" + "binaryen-bin" "odoc" {with-doc} ] depopts: ["ocamlfind"]