Fix CI

.github/workflows/test.yml

@@ -12,11 +12,8 @@ jobs:
         os:
           - macos-latest
         ocaml-version:
-          - 4.12.0
-          - 4.11.1
-          - 4.10.2
-          - 4.09.1
-          - 4.08.1
+          - 5.1.1
+          - 5.1.0
 
     runs-on: ${{ matrix.os }}
 

CHANGES.md

@@ -1,5 +1,6 @@
 ### Pending
 
+- Move to Eio (#37, @patricoferris, @clecat)
 - Use _WIN32 and MAX_PATH on Windows to support MSVC (#34, @jonahbeckford)
 
 ### 0.5.0 (2020-04-30)

dune-project

@@ -1,34 +1,45 @@
 (lang dune 2.8)
+
 (name irmin-watcher)
 
 (generate_opam_files true)
 
-(source (github mirage/irmin-watcher))
+(source
+ (github mirage/irmin-watcher))
+
 (license ISC)
+
 (authors "Thomas Gazagnaire")
+
 (maintainers "Thomas Gazagnaire")
+
 (documentation "https://mirage.github.io/irmin-watcher/")
 
 (package
  (name irmin-watcher)
  (synopsis "Portable Irmin watch backends using FSevents or Inotify")
- (description "irmin-watcher implements [Irmin's watch hooks][watch] for various OS,
-using FSevents in macOS and Inotify on Linux.
-
-irmin-watcher is distributed under the ISC license.
-
-[watch]: http://mirage.github.io/irmin/irmin/Irmin/Private/Watch/index.html#type-hook
-")
+ (description
+  "irmin-watcher implements [Irmin's watch hooks][watch] for various OS,\nusing FSevents in macOS and Inotify on Linux.\n\nirmin-watcher is distributed under the ISC license.\n\n[watch]: http://mirage.github.io/irmin/irmin/Irmin/Private/Watch/index.html#type-hook\n")
  (depends
-   (ocaml (>= "4.02.0"))
-   (alcotest :with-test)
-   (mtime (and :with-test (>= "2.0.0")))
-   (inotify (= :os "linux"))
-   (cf-lwt (>="0.4"))
-   lwt
-   logs
-   fmt
-   astring
-   fsevents-lwt
- )
-)
+  (ocaml
+   (>= "5.1.0"))
+  (alcotest :with-test)
+  (mtime
+   (and
+    :with-test
+    (>= "2.0.0")))
+  (inotify
+   (= :os "linux"))
+  (cf-lwt
+   (>= "0.4"))
+  lwt
+  (eio
+   (>= "1.0"))
+  (eio_main
+   (and
+    :with-test
+    (>= "1.0")))
+  logs
+  fmt
+  astring
+  fsevents-lwt))

irmin-watcher.opam

@@ -17,12 +17,14 @@ doc: "https://mirage.github.io/irmin-watcher/"
 bug-reports: "https://github.com/mirage/irmin-watcher/issues"
 depends: [
   "dune" {>= "2.8"}
-  "ocaml" {>= "4.02.0"}
+  "ocaml" {>= "5.1.0"}
   "alcotest" {with-test}
   "mtime" {with-test & >= "2.0.0"}
   "inotify" {os = "linux"}
   "cf-lwt" {>= "0.4"}
   "lwt"
+  "eio" {>= "1.0"}
+  "eio_main" {with-test & >= "1.0"}
   "logs"
   "fmt"
   "astring"

src/backend.inotify.ml

@@ -4,8 +4,6 @@
    %%NAME%% %%VERSION%%
   ---------------------------------------------------------------------------*)
 
-open Lwt.Infix
-
 let src = Logs.Src.create "irw-inotify" ~doc:"Irmin watcher using Inotify"
 
 module Log = (val Logs.src_log src : Logs.LOG)

src/dune

@@ -8,7 +8,6 @@
   fmt
   logs
   astring
-  lwt_eio
   eio.unix
   (select
    backend.ml

src/hook.mli

@@ -20,7 +20,7 @@ val v :
   Watchdog.hook
 (** [v ~sw ~wait_for_changes ~dir] is the watchdog hook using [wait_for_changes]
     to detect filesystem updates in the directory [dir]. The polling
-    implemention just calls [Lwt_unix.sleep]. The switch is used for the forked
+    implemention just calls [Eio_unix.sleep]. The switch is used for the forked
     callback function. *)
 
 (*---------------------------------------------------------------------------

test/test.ml

@@ -10,7 +10,7 @@ let clean () =
 
 let run f () =
   clean ();
-  f ()
+  try f () with Failure s when s = "Cancelled" -> ()
 
 let rec mkdir d =
   let perm = 0o0700 in