Skip to content

Commit f9f907c

Browse files
committed
build: remove circular dependency between reason-react{,-ppx} at test time
1 parent 0c6ab61 commit f9f907c

17 files changed

Lines changed: 8 additions & 4 deletions

File tree

flake.nix

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,12 @@
5252
];
5353
};
5454

55-
# Due to a Reason version mismatch, the generated OCaml PPX diff
56-
# looks different
57-
doCheck = false;
55+
doCheck = true;
56+
nativeCheckInputs = [
57+
reason
58+
merlin
59+
pkgs.jq
60+
];
5861
propagatedBuildInputs = [ ppxlib_gt_0_37 ];
5962
};
6063

@@ -81,6 +84,8 @@
8184
nativeBuildInputs = [
8285
melange
8386
reason
87+
merlin
88+
pkgs.jq
8489
];
8590
propagatedBuildInputs = [
8691
melange

ppx/test/dune

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
(cram
22
(package reason-react-ppx)
33
(deps
4-
(package reason-react)
54
%{bin:reason-react-ppx}
65
%{bin:refmt}
76
%{bin:dune}

ppx/test/components-destructured-error.t/component.re renamed to test/blackbox-tests/components-destructured-error.t/component.re

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)