Skip to content

Commit baa9ef0

Browse files
committed
Fix CI
1 parent 140deeb commit baa9ef0

File tree

4 files changed

+23
-3
lines changed

4 files changed

+23
-3
lines changed

benchmarks/dune

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
(:standard -w -58))))
55

66
(executables
7+
(enabled_if
8+
(not %{env:CI=false}))
79
(libraries
810
re
911
core
@@ -17,6 +19,8 @@
1719
(names benchmark))
1820

1921
(executable
22+
(enabled_if
23+
(not %{env:CI=false}))
2024
(name compare)
2125
(modules compare)
2226
(libraries

dune-project

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(lang dune 3.12)
1+
(lang dune 3.15)
22

33
(name re)
44

@@ -24,7 +24,8 @@
2424
(ocaml (>= 4.12.0))
2525
seq
2626
(ppx_expect :with-test)
27-
(ounit2 :with-test))
27+
(ounit2 :with-test)
28+
(js_of_ocaml :with-test))
2829
(description "
2930
Pure OCaml regular expressions with:
3031
* Perl-style regular expressions (module Re.Perl)

lib_test/expect/dune

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
ppx_expect.config
88
ppx_expect.config_types
99
ppx_expect
10+
ppx_expect_common
1011
base
1112
str
1213
ppx_inline_test.config)
@@ -15,6 +16,19 @@
1516
(preprocess
1617
(pps ppx_expect)))
1718

19+
;; ppx_expect v16 depends on ppx_expect.common
20+
(subdir
21+
ppx_expect_common
22+
(library
23+
(name ppx_expect_common)
24+
(enabled_if
25+
(< %{ocaml_version} 5.0))
26+
(libraries (re_export ppx_expect.common)))
27+
(library
28+
(name ppx_expect_common)
29+
(enabled_if
30+
(>= %{ocaml_version} 5.0))))
31+
1832
;; this hackery is needed because ppx_expect itself uses re, therefore we need to mangle
1933
;; the library name
2034

re.opam

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,12 @@ license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception"
2222
homepage: "https://github.com/ocaml/ocaml-re"
2323
bug-reports: "https://github.com/ocaml/ocaml-re/issues"
2424
depends: [
25-
"dune" {>= "3.12"}
25+
"dune" {>= "3.15"}
2626
"ocaml" {>= "4.12.0"}
2727
"seq"
2828
"ppx_expect" {with-test}
2929
"ounit2" {with-test}
30+
"js_of_ocaml" {with-test}
3031
"odoc" {with-doc}
3132
]
3233
build: [

0 commit comments

Comments
 (0)