Skip to content

Commit e6661cc

Browse files
committed
Remove vendored mdx and all mdx tests
We'll re-enable them after we've split the parser out of odoc and removed the cyclic dependency with mdx. Signed-off-by: Jon Ludlam <[email protected]>
1 parent 42983a2 commit e6661cc

File tree

8 files changed

+2
-66
lines changed

8 files changed

+2
-66
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,9 @@ jobs:
3838
with:
3939
ocaml-version: ${{ matrix.ocaml-version }}
4040

41-
# Pull the Mdx submodule
42-
# actions/checkout doesn't support that
43-
# Also, this is supposed to be temporary
44-
- run: git submodule update --init
45-
4641
- name: Install dependencies
4742
if: steps.cache.outputs.cache-hit != 'true'
4843
run: |
49-
# Mdx dependencies
50-
opam pin add -n ./mdx
51-
opam depext -y -t mdx
52-
opam install --deps-only mdx
53-
# -
5444
opam pin add -n .
5545
opam depext -y -t odoc
5646
opam install --deps-only -t odoc

.gitmodules

Lines changed: 0 additions & 3 deletions
This file was deleted.

dune

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,3 @@
88
(release
99
(flags
1010
(:standard -g -w -18-53))))
11-
12-
(vendored_dirs mdx)

dune-project

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
(lang dune 2.7)
22
(name odoc)
3-
(using mdx 0.1)
43
(cram enable)

mdx

Lines changed: 0 additions & 1 deletion
This file was deleted.

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
"@opam/result": "1.4",
4343
"@opam/sexplib0": "*",
4444
"@opam/tyxml": "4.3.0",
45-
"@opam/mdx": "1.7.0",
4645
"@opam/ocamlfind-secondary":"1.8.1",
4746
"ocaml": "~4.2.0"
4847
},

src/xref2/dune

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -4,51 +4,3 @@
44
(instrumentation
55
(backend bisect_ppx))
66
(libraries compiler-libs.common odoc_model unix))
7-
8-
(rule
9-
(alias runtest)
10-
(deps
11-
(:x paths.md)
12-
(package odoc))
13-
(enabled_if
14-
(> %{ocaml_version} 4.08))
15-
(action
16-
(progn
17-
(run ocaml-mdx-test %{x})
18-
(diff? %{x} %{x}.corrected))))
19-
20-
(rule
21-
(alias runtest)
22-
(deps
23-
(:x test.md)
24-
(package odoc))
25-
(enabled_if
26-
(> %{ocaml_version} 4.08))
27-
(action
28-
(progn
29-
(run ocaml-mdx-test %{x})
30-
(diff? %{x} %{x}.corrected))))
31-
32-
(rule
33-
(alias runtest)
34-
(deps
35-
(:x notes.md)
36-
(package odoc))
37-
(enabled_if
38-
(> %{ocaml_version} 4.08))
39-
(action
40-
(progn
41-
(run ocaml-mdx-test %{x})
42-
(diff? %{x} %{x}.corrected))))
43-
44-
(rule
45-
(alias runtest)
46-
(deps
47-
(:x scratch.md)
48-
(package odoc))
49-
(enabled_if
50-
(> %{ocaml_version} 4.08))
51-
(action
52-
(progn
53-
(run ocaml-mdx-test %{x})
54-
(diff? %{x} %{x}.corrected))))

test/xref2/dune

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,7 @@
99
(../odoc_print/odoc_print.exe as odoc_print)
1010
(./compile.exe as compile))))
1111

12+
(dirs :standard \ strengthen subst refs resolve)
13+
1214
(cram
1315
(deps %{bin:odoc} %{bin:odoc_print} %{bin:compile}))

0 commit comments

Comments
 (0)