From e61b340fd225eb9227c11d9ccd59b6644c5c4754 Mon Sep 17 00:00:00 2001 From: Olivier Nicole Date: Mon, 17 Jan 2022 17:43:54 +0100 Subject: [PATCH 1/2] Use new name of EffectHandlers (Effect) The renaming was made by https://github.com/ocaml/ocaml/pull/10879. --- lib/task.ml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/task.ml b/lib/task.ml index 5079efe..847d042 100644 --- a/lib/task.ml +++ b/lib/task.ml @@ -1,5 +1,5 @@ -open EffectHandlers -open EffectHandlers.Deep +open Effect +open Effect.Deep type 'a task = unit -> 'a From 00f016cbb226e539c038f4700d354296d6c140ba Mon Sep 17 00:00:00 2001 From: Sudha Parimala Date: Thu, 20 Jan 2022 11:44:24 +0530 Subject: [PATCH 2/2] Add 5.00+trunk to CI and remove older variants --- .github/workflows/main.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 17be0d5..350d082 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,8 +15,7 @@ jobs: - ubuntu-latest - macos-latest ocaml-compiler: - - 4.12.0+domains - - 4.12.0+domains+effects + - 5.00.0+trunk runs-on: ${{ matrix.os }} @@ -24,25 +23,29 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - - name: Get latest Multicore commit hash + - name: Get latest OCaml commit hash id: multicore_hash shell: bash run: | curl -sH "Accept: application/vnd.github.v3+json" \ - https://api.github.com/repos/ocaml-multicore/ocaml-multicore/commits/4.12+domains+effects \ + https://api.github.com/repos/ocaml/ocaml/commits/trunk \ | jq .commit.tree.sha | xargs printf '::set-output name=commit::%s' - - name: Use OCaml ${{ matrix.ocaml-compiler }} uses: ocaml/setup-ocaml@v2 with: ocaml-compiler: ocaml-variants.${{ matrix.ocaml-compiler }} opam-repositories: | - multicore: https://github.com/ocaml-multicore/multicore-opam.git default: https://github.com/ocaml/opam-repository.git + ocaml-beta-repository: https://github.com/ocaml/ocaml-beta-repository.git cache-prefix: ${{ steps.multicore_hash.outputs.commit }} + opam-depext: false + + - run: opam pin add dune --dev-repo + + - run: opam pin add ocamlfind git+https://github.com/ocaml/ocamlfind.git - run: opam install . --deps-only --with-test - run: opam exec -- make all - - run: opam exec -- make run_test + - run: opam exec -- make run_test \ No newline at end of file