Fix CI

Author: vouillon

.github/workflows/main.yml

@@ -10,7 +10,7 @@ jobs:
         os:
           - macos-latest
           - ubuntu-latest
-          - windows-latest
+#          - windows-latest
         ocaml-compiler:
           - "4.14"
           - "5.2"
@@ -21,6 +21,5 @@ jobs:
         with:
           ocaml-compiler: ${{ matrix.ocaml-compiler }}
       - run: opam install . --deps-only --with-test
-      - run: opam install core_bench core_unix
       - run: opam exec -- dune build
       - run: opam exec -- dune runtest

benchmarks/dune

@@ -4,6 +4,8 @@
    (:standard -w -58))))
 
 (executables
+ (enabled_if
+  (not %{env:CI=false}))
  (libraries
   re
   core
@@ -17,6 +19,8 @@
  (names benchmark))
 
 (executable
+ (enabled_if
+  (not %{env:CI=false}))
  (name compare)
  (modules compare)
  (libraries

dune-project

@@ -1,4 +1,4 @@
-(lang dune 3.12)
+(lang dune 3.15)
 
 (name re)
 
@@ -23,7 +23,8 @@
  (depends
   (ocaml (>= 4.12.0))
   (ppx_expect :with-test)
-  (ounit2 :with-test))
+  (ounit2 :with-test)
+  (js_of_ocaml :with-test))
  (description "
 Pure OCaml regular expressions with:
 * Perl-style regular expressions (module Re.Perl)

lib_test/expect/dune

@@ -7,6 +7,7 @@
   ppx_expect.config
   ppx_expect.config_types
   ppx_expect
+  ppx_expect_common
   base
   str
   ppx_inline_test.config)
@@ -15,6 +16,19 @@
  (preprocess
   (pps ppx_expect)))
 
+;; ppx_expect v16 depends on ppx_expect.common
+(subdir
+ ppx_expect_common
+ (library
+  (name ppx_expect_common)
+  (enabled_if
+   (< %{ocaml_version} 5.0))
+  (libraries (re_export ppx_expect.common)))
+ (library
+  (name ppx_expect_common)
+  (enabled_if
+   (>= %{ocaml_version} 5.0))))
+
 ;; this hackery is needed because ppx_expect itself uses re, therefore we need to mangle
 ;; the library name
 

re.opam

@@ -22,10 +22,11 @@ license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception"
 homepage: "https://github.com/ocaml/ocaml-re"
 bug-reports: "https://github.com/ocaml/ocaml-re/issues"
 depends: [
-  "dune" {>= "3.12"}
+  "dune" {>= "3.15"}
   "ocaml" {>= "4.12.0"}
   "ppx_expect" {with-test}
   "ounit2" {with-test}
+  "js_of_ocaml" {with-test}
   "odoc" {with-doc}
 ]
 build: [