Skip to content

Commit 20d9f74

Browse files
authored
Merge pull request #63 from Sudha247/5.00-ci
Run CI with trunk OCaml
2 parents df4afa2 + 00f016c commit 20d9f74

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

.github/workflows/main.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,34 +15,37 @@ jobs:
1515
- ubuntu-latest
1616
- macos-latest
1717
ocaml-compiler:
18-
- 4.12.0+domains
19-
- 4.12.0+domains+effects
18+
- 5.00.0+trunk
2019

2120
runs-on: ${{ matrix.os }}
2221

2322
steps:
2423
- name: Checkout code
2524
uses: actions/checkout@v2
2625

27-
- name: Get latest Multicore commit hash
26+
- name: Get latest OCaml commit hash
2827
id: multicore_hash
2928
shell: bash
3029
run: |
3130
curl -sH "Accept: application/vnd.github.v3+json" \
32-
https://api.github.com/repos/ocaml-multicore/ocaml-multicore/commits/4.12+domains+effects \
31+
https://api.github.com/repos/ocaml/ocaml/commits/trunk \
3332
| jq .commit.tree.sha | xargs printf '::set-output name=commit::%s'
34-
3533
- name: Use OCaml ${{ matrix.ocaml-compiler }}
3634
uses: ocaml/setup-ocaml@v2
3735
with:
3836
ocaml-compiler: ocaml-variants.${{ matrix.ocaml-compiler }}
3937
opam-repositories: |
40-
multicore: https://github.com/ocaml-multicore/multicore-opam.git
4138
default: https://github.com/ocaml/opam-repository.git
39+
ocaml-beta-repository: https://github.com/ocaml/ocaml-beta-repository.git
4240
cache-prefix: ${{ steps.multicore_hash.outputs.commit }}
41+
opam-depext: false
42+
43+
- run: opam pin add dune --dev-repo
44+
45+
- run: opam pin add ocamlfind git+https://github.com/ocaml/ocamlfind.git
4346

4447
- run: opam install . --deps-only --with-test
4548

4649
- run: opam exec -- make all
4750

48-
- run: opam exec -- make run_test
51+
- run: opam exec -- make run_test

lib/task.ml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
open EffectHandlers
2-
open EffectHandlers.Deep
1+
open Effect
2+
open Effect.Deep
33

44
type 'a task = unit -> 'a
55

0 commit comments

Comments
 (0)