Skip to content

Build: dune alias for js and wasm #1760

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 9, 2024
Merged

Build: dune alias for js and wasm #1760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
873a721
Build: dune alias for js and wasm
hhugo Dec 5, 2024
47d462c
WIP
hhugo Dec 9, 2024
fce7be1
faster CI for build-wasm_of_ocaml
hhugo Dec 9, 2024
3371c59
fix index wasm files
hhugo Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions .github/workflows/build-wasm_of_ocaml.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ jobs:
env:
OPAMJOBS: 2
OPAMYES: true
WASM_OF_OCAML: true

strategy:
fail-fast: false
Expand All @@ -19,15 +20,15 @@ jobs:
- ubuntu-latest
ocaml-compiler:
- 4.14.x
- 5.00.x
- 5.01.x
- 5.02.x
- 5.0.x
- 5.1.x
- 5.2.x
- ocaml-compiler.5.3.0~beta2
separate_compilation:
- true
include:
- os: macos-latest
ocaml-compiler: 5.02.x
ocaml-compiler: 5.2.x
separate_compilation: true
- os: ubuntu-latest
ocaml-compiler: 4.14.x
Expand Down Expand Up @@ -92,12 +93,12 @@ jobs:
- name: Run tests
if: ${{ matrix.separate_compilation }}
working-directory: ./wasm_of_ocaml
run: opam exec -- dune build @all @runtest --profile wasm
run: opam exec -- dune build @runtest-wasm

- name: Run tests with CPS effects
if: ${{ matrix.ocaml-compiler >= '5.' && matrix.separate_compilation }}
working-directory: ./wasm_of_ocaml
run: opam exec -- dune build @all @runtest --profile wasm-effects
run: opam exec -- dune build @runtest-wasm --profile with-effects

- name: Run Base tests
if: ${{ matrix.ocaml-compiler < '5.' && matrix.separate_compilation }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ jobs:
- run: opam exec -- make tests
if: ${{ !matrix.skip-test }}

- run: opam exec -- dune build @all @runtest --profile using-effects
- run: opam exec -- dune build @all @runtest @runtest-js --profile with-effects
if: ${{ !matrix.skip-effects }}

- run: opam exec -- git diff --exit-code
Expand Down
7 changes: 5 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ all:
dune build @all

tests:
dune runtest
dune build @runtest @runtest-js

tests-wasm:
WASM_OF_OCAML=true dune build @runtest-wasm

test runtest runtests: tests

Expand Down Expand Up @@ -31,4 +34,4 @@ installdoc:
git worktree add _wikidoc origin/wikidoc
rsync -av doc-dev/ _wikidoc/doc/dev/

.PHONY: all tests test runtest runtests doc clean installdoc
.PHONY: all tests tests-wasm test runtest runtests doc clean installdoc
Loading
Loading