Skip to content

Commit

Permalink
CI fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
OlivierNicole authored and vouillon committed Oct 2, 2024
1 parent 669db6b commit 4985ad1
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 6 deletions.
14 changes: 12 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand Down
6 changes: 5 additions & 1 deletion biome.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
5 changes: 3 additions & 2 deletions dune-project
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -150,7 +150,8 @@
menhir
menhirLib
menhirSdk
yojson)
yojson
binaryen-bin)
(depopts
ocamlfind)
(conflicts
Expand Down
3 changes: 2 additions & 1 deletion wasm_of_ocaml-compiler.opam
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -25,6 +25,7 @@ depends: [
"menhirLib"
"menhirSdk"
"yojson"
"binaryen-bin"
"odoc" {with-doc}
]
depopts: ["ocamlfind"]
Expand Down

0 comments on commit 4985ad1

Please sign in to comment.