Skip to content

Commit 80709d9

Browse files
authored
Some tweaks before release (#1121)
* Update CHANGES.md * Add .ocamlformat dep in test/cli and test/failing * Add .ocamlformat to disabled test
1 parent b3d2ce1 commit 80709d9

File tree

7 files changed

+35
-1
lines changed

7 files changed

+35
-1
lines changed

Diff for: CHANGES.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
### (master)
1+
### 0.12 (2019-11-04)
22

33
#### Changes
44

Diff for: test/cli/.ocamlformat

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
profile = ocamlformat
2+
break-cases = fit
3+
margin = 77
4+
parse-docstrings = true
5+
wrap-comments = true
6+
max-iters = 2

Diff for: test/cli/dune.inc

+14
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11

22
(rule
33
(targets err_default_several_file.output)
4+
(deps .ocamlformat)
45
(action
56
(with-outputs-to %{targets}
67
(system "! %{bin:ocamlformat} %{read-lines:err_default_several_file.opts}"))))
@@ -11,6 +12,7 @@
1112

1213
(rule
1314
(targets err_inplace_and_check.output)
15+
(deps .ocamlformat)
1416
(action
1517
(with-outputs-to %{targets}
1618
(system "! %{bin:ocamlformat} %{read-lines:err_inplace_and_check.opts}"))))
@@ -21,6 +23,7 @@
2123

2224
(rule
2325
(targets err_inplace_and_output.output)
26+
(deps .ocamlformat)
2427
(action
2528
(with-outputs-to %{targets}
2629
(system "! %{bin:ocamlformat} %{read-lines:err_inplace_and_output.opts}"))))
@@ -31,6 +34,7 @@
3134

3235
(rule
3336
(targets err_no_arg.output)
37+
(deps .ocamlformat)
3438
(action
3539
(with-outputs-to %{targets}
3640
(system "! %{bin:ocamlformat} %{read-lines:err_no_arg.opts}"))))
@@ -41,6 +45,7 @@
4145

4246
(rule
4347
(targets err_output_and_check.output)
48+
(deps .ocamlformat)
4449
(action
4550
(with-outputs-to %{targets}
4651
(system "! %{bin:ocamlformat} %{read-lines:err_output_and_check.opts}"))))
@@ -51,6 +56,7 @@
5156

5257
(rule
5358
(targets err_output_several_files.output)
59+
(deps .ocamlformat)
5460
(action
5561
(with-outputs-to %{targets}
5662
(system "! %{bin:ocamlformat} %{read-lines:err_output_several_files.opts}"))))
@@ -61,6 +67,7 @@
6167

6268
(rule
6369
(targets err_stdin_and_file.output)
70+
(deps .ocamlformat)
6471
(action
6572
(with-outputs-to %{targets}
6673
(system "! %{bin:ocamlformat} %{read-lines:err_stdin_and_file.opts}"))))
@@ -71,6 +78,7 @@
7178

7279
(rule
7380
(targets err_stdin_and_inplace.output)
81+
(deps .ocamlformat)
7482
(action
7583
(with-outputs-to %{targets}
7684
(system "! %{bin:ocamlformat} %{read-lines:err_stdin_and_inplace.opts}"))))
@@ -81,6 +89,7 @@
8189

8290
(rule
8391
(targets err_stdin_name_unknown_ext.output)
92+
(deps .ocamlformat)
8493
(action
8594
(with-outputs-to %{targets}
8695
(system "! %{bin:ocamlformat} %{read-lines:err_stdin_name_unknown_ext.opts} < err_stdin_name_unknown_ext.stdin"))))
@@ -91,6 +100,7 @@
91100

92101
(rule
93102
(targets err_stdin_no_kind.output)
103+
(deps .ocamlformat)
94104
(action
95105
(with-outputs-to %{targets}
96106
(system "! %{bin:ocamlformat} %{read-lines:err_stdin_no_kind.opts}"))))
@@ -101,6 +111,7 @@
101111

102112
(rule
103113
(targets name_unknown_ext.output)
114+
(deps .ocamlformat)
104115
(action
105116
(with-outputs-to %{targets}
106117
(system "%{bin:ocamlformat} %{read-lines:name_unknown_ext.opts}"))))
@@ -111,6 +122,7 @@
111122

112123
(rule
113124
(targets stdin_and_impl.output)
125+
(deps .ocamlformat)
114126
(action
115127
(with-outputs-to %{targets}
116128
(system "%{bin:ocamlformat} %{read-lines:stdin_and_impl.opts} < stdin_and_impl.stdin"))))
@@ -121,6 +133,7 @@
121133

122134
(rule
123135
(targets stdin_and_intf.output)
136+
(deps .ocamlformat)
124137
(action
125138
(with-outputs-to %{targets}
126139
(system "%{bin:ocamlformat} %{read-lines:stdin_and_intf.opts} < stdin_and_intf.stdin"))))
@@ -131,6 +144,7 @@
131144

132145
(rule
133146
(targets stdin_and_name.output)
147+
(deps .ocamlformat)
134148
(action
135149
(with-outputs-to %{targets}
136150
(system "%{bin:ocamlformat} %{read-lines:stdin_and_name.opts} < stdin_and_name.stdin"))))

Diff for: test/cli/gen/gen.ml

+1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ let emit_test test_name entry =
5151
Format.printf {|
5252
(rule@
5353
(targets %s.output)@
54+
(deps .ocamlformat)@
5455
(action@
5556
@[%a@]))@
5657
|} test_name run_action ();

Diff for: test/disabled/dir1/.ocamlformat

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
profile = ocamlformat
2+
break-cases = fit
3+
margin = 77
4+
parse-docstrings = true
5+
wrap-comments = true
6+
max-iters = 2

Diff for: test/failing/.ocamlformat

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
profile = ocamlformat
2+
break-cases = fit
3+
margin = 77
4+
parse-docstrings = true
5+
wrap-comments = true
6+
max-iters = 2

Diff for: test/failing/dune

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
(rule
22
(targets list_and_comments.ml.output)
3+
(deps .ocamlformat)
34
(action
45
(with-outputs-to %{targets}
56
(run %{bin:ocamlformat} %{dep:list_and_comments.ml}))))

0 commit comments

Comments
 (0)