Re-enable reason in CI

Reason's dependency profile is more reasonable now. We can attempt to re-enable it

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
This commit is contained in:
Rudi Grinberg 2018-07-07 22:14:15 +07:00
parent 5a31b9304c
commit 254b5d6bdd
7 changed files with 109 additions and 93 deletions

View File

@ -46,7 +46,7 @@ case "$TARGET" in
rm -rf ~/.opam
opam init --yes
eval $(opam config env)
opam install ocamlfind utop ppx_driver odoc menhir ocaml-migrate-parsetree js_of_ocaml-ppx js_of_ocaml-compiler--yes
opam install ocamlfind utop reason ppx_driver odoc menhir ocaml-migrate-parsetree js_of_ocaml-ppx js_of_ocaml-compiler--yes
opam remove jbuilder `opam list --depends-on jbuilder --installed --short` --yes
if opam info dune &> /dev/null; then
opam remove dune `opam list --depends-on dune --installed --short` --yes
@ -82,7 +82,7 @@ case "$TARGET" in
echo "depends: [\"dune\"]" >> jbuilder.opam
opam pin add dune . --no-action --yes
opam pin add jbuilder . --no-action --yes
opam install ocamlfind utop ppx_driver odoc ocaml-migrate-parsetree js_of_ocaml-ppx js_of_ocaml-compiler --yes
opam install ocamlfind utop reason ppx_driver odoc ocaml-migrate-parsetree js_of_ocaml-ppx js_of_ocaml-compiler --yes
echo -en "travis_fold:end:opam.deps\r"
fi
echo -en "travis_fold:start:dune.bootstrap\r"

View File

@ -788,6 +788,7 @@
(alias project-root)
(alias promote)
(alias quoting)
(alias reason)
(alias redirections)
(alias reporting-of-cycles)
(alias scope-bug)
@ -882,6 +883,6 @@
(alias windows-diff)
(alias workspaces)))
(alias (name runtest-disabled) (deps (alias reason)))
(alias (name runtest-disabled) (deps))
(alias (name runtest-js) (deps (alias js_of_ocaml)))

View File

@ -107,7 +107,7 @@ let exclusions =
; make "output-obj" ~skip_platforms:[Mac; Win] ~skip_ocaml:"<4.06.0"
; make "github644" ~external_deps:true
; make "private-public-overlap" ~external_deps:true
; make "reason" ~enabled:false
; make "reason" ~external_deps:true
; make "menhir"~external_deps:true
; make "utop"~external_deps:true
; make "configurator" ~skip_platforms:[Win]

View File

@ -4,31 +4,31 @@
(library
((name rlib)
(public_name rlib)
(modules bar cppome foo hello pped)
(modules (bar cppome foo hello pped))
(lint
(per_module
((pps (reasonppx (-lint true))) (hello cppome))
((action (run ./pp/reasononlypp.exe -lint %{first-dep})) (foo bar pped))))
((action (run ./pp/reasononlypp.exe -lint ${<})) (foo bar pped))))
(preprocess
(per_module
((pps (reasonppx)) (foo))
((pps (reasonppx (-lint false))) (hello))
((action (run ./pp/reasononlypp.exe %{first-dep})) (cppome))))))
((action (run ./pp/reasononlypp.exe ${<})) (cppome))))))
(executable
((name rbin)
(modules rbin)
(lint (action (run ./pp/reasononlypp.exe -lint %{first-dep})))
(preprocess (action (run ./pp/reasononlypp.exe %{first-dep})))
(lint (action (run ./pp/reasononlypp.exe -lint ${<})))
(preprocess (action (run ./pp/reasononlypp.exe ${<})))
(libraries (rlib))))
;; we want to make sure that .rei files are present
(alias
((name install-file)
(deps (rlib.install))
(action (echo "%{read:rlib.install}"))))
(action (echo "${read:rlib.install}"))))
(alias
((name runtest)
(deps (rbin.exe))
(action (run %{first-dep}))))
(action (run ${<}))))

View File

@ -1,2 +1,2 @@
(executable
((name reasononlypp)))
(name reasononlypp))

View File

@ -1,5 +1,5 @@
(library
((name reasonppx)
(wrapped false)
(kind ppx_rewriter)
(libraries (ocaml-migrate-parsetree))))
(name reasonppx)
(wrapped false)
(kind ppx_rewriter)
(libraries ocaml-migrate-parsetree))

View File

@ -1,94 +1,109 @@
$ dune build @runtest @install-file --display short
Info: creating file dune-project with this contents: (lang dune 1.0)
refmt bar.re.ml
ocamldep pp/reasononlypp.depends.ocamldep-output
ocamldep ppx/reasonppx.depends.ocamldep-output
refmt hello.re.ml
refmt pped.re.ml
ocamlc rlib.{cmi,cmo,cmt}
refmt foo.re.mli
refmt hello.re.mli
refmt pped.re.mli
ocamlc pp/reasononlypp.{cmi,cmo,cmt}
ocamlc ppx/reasonppx.{cmi,cmo,cmt}
ocamlopt rlib.{cmx,o}
ocamlopt pp/reasononlypp.{cmx,o}
ocamlopt ppx/reasonppx.{cmx,o}
ocamldep .rlib.objs/bar.re.ml.d
ocamldep pp/.reasononlypp.eobjs/reasononlypp.ml.d
ocamlc pp/.reasononlypp.eobjs/reasononlypp.{cmi,cmo,cmt}
ocamlopt pp/.reasononlypp.eobjs/reasononlypp.{cmx,o}
ocamlopt pp/reasononlypp.exe
ocamlopt ppx/reasonppx.{a,cmxa}
reasononlypp cppome.pp.re
reasononlypp cppome.pp.rei
reasononlypp rbin.pp.re
ocamlopt .ppx/reasonppx/ppx.exe
refmt cppome.pp.re.ml
refmt cppome.pp.re.mli
refmt rbin.pp.re.ml
ocamldep .rlib.objs/cppome.pp.re.ml.d
ocamldep ppx/.reasonppx.objs/reasonppx.ml.d
ocamlc ppx/.reasonppx.objs/reasonppx.{cmi,cmo,cmt}
ocamlopt ppx/.reasonppx.objs/reasonppx.{cmx,o}
ocamlopt ppx/reasonppx.{a,cmxa}
ocamlopt .ppx/jbuild/reasonppx@rlib/ppx.exe
ppx foo.pp.ml
ocamldep .rlib.objs/foo.pp.ml.d
refmt hello.re.ml
ppx hello.re.pp.ml
ocamldep .rlib.objs/hello.re.pp.ml.d
refmt pped.re.ml
ocamldep .rlib.objs/pped.re.ml.d
ocamlc .rlib.objs/rlib.{cmi,cmo,cmt}
ocamlopt .rlib.objs/rlib.{cmx,o}
ocamldep .rlib.objs/bar.mli.d
ocamlc .rlib.objs/rlib__Bar.{cmi,cmti}
ocamlopt .rlib.objs/rlib__Bar.{cmx,o}
refmt foo.re.mli
ppx foo.re.pp.mli
ocamldep .rlib.objs/foo.re.pp.mli.d
ocamlc .rlib.objs/rlib__Foo.{cmi,cmti}
ocamlopt .rlib.objs/rlib__Foo.{cmx,o}
refmt hello.re.mli
ppx hello.re.pp.mli
ocamldep rbin.depends.ocamldep-output
ocamldep rlib.depends.ocamldep-output
ocamldep rlib.dependsi.ocamldep-output
ocamlc rlib__Bar.{cmi,cmti}
ocamlc rlib__Cppome.{cmi,cmti}
ocamlc rlib__Foo.{cmi,cmti}
ocamlc rlib__Hello.{cmi,cmti}
ocamlc rlib__Pped.{cmi,cmti}
ocamlc rlib__Bar.{cmo,cmt}
ocamlopt rlib__Bar.{cmx,o}
ocamlc rlib__Cppome.{cmo,cmt}
ocamlopt rlib__Cppome.{cmx,o}
ocamlc rlib__Foo.{cmo,cmt}
ocamlopt rlib__Foo.{cmx,o}
ocamlc rlib__Hello.{cmo,cmt}
ocamlopt rlib__Hello.{cmx,o}
ocamlc rlib__Pped.{cmo,cmt}
ocamlopt rlib__Pped.{cmx,o}
ocamlc rbin.{cmi,cmo,cmt}
ocamlc rlib.cma
ocamldep .rlib.objs/hello.re.pp.mli.d
ocamlc .rlib.objs/rlib__Hello.{cmi,cmti}
ocamlopt .rlib.objs/rlib__Hello.{cmx,o}
refmt pped.re.mli
ocamldep .rlib.objs/pped.re.mli.d
ocamlc .rlib.objs/rlib__Pped.{cmi,cmti}
ocamlopt .rlib.objs/rlib__Pped.{cmx,o}
reasononlypp cppome.pp.rei
refmt cppome.pp.re.mli
ocamldep .rlib.objs/cppome.pp.re.mli.d
ocamlc .rlib.objs/rlib__Cppome.{cmi,cmti}
ocamlopt .rlib.objs/rlib__Cppome.{cmx,o}
ocamlopt rlib.{a,cmxa}
ocamlopt rbin.{cmx,o}
ocamlopt rlib.cmxs
lib: [
"_build/install/default/lib/rlib/META" {"META"}
"_build/install/default/lib/rlib/opam" {"opam"}
"_build/install/default/lib/rlib/rlib__Bar.cmi"
"_build/install/default/lib/rlib/rlib__Bar.cmx"
"_build/install/default/lib/rlib/rlib__Bar.cmt"
"_build/install/default/lib/rlib/rlib__Bar.cmti"
"_build/install/default/lib/rlib/bar.mli"
"_build/install/default/lib/rlib/rlib__Cppome.cmi"
"_build/install/default/lib/rlib/rlib__Cppome.cmx"
"_build/install/default/lib/rlib/rlib__Cppome.cmt"
"_build/install/default/lib/rlib/rlib__Cppome.cmti"
"_build/install/default/lib/rlib/cppome.rei"
"_build/install/default/lib/rlib/rlib__Foo.cmi"
"_build/install/default/lib/rlib/rlib__Foo.cmx"
"_build/install/default/lib/rlib/rlib__Foo.cmt"
"_build/install/default/lib/rlib/rlib__Foo.cmti"
"_build/install/default/lib/rlib/foo.rei"
"_build/install/default/lib/rlib/rlib__Hello.cmi"
"_build/install/default/lib/rlib/rlib__Hello.cmx"
"_build/install/default/lib/rlib/rlib__Hello.cmt"
"_build/install/default/lib/rlib/rlib__Hello.cmti"
"_build/install/default/lib/rlib/hello.rei"
"_build/install/default/lib/rlib/rlib__Pped.cmi"
"_build/install/default/lib/rlib/rlib__Pped.cmx"
"_build/install/default/lib/rlib/rlib__Pped.cmt"
"_build/install/default/lib/rlib/rlib__Pped.cmti"
"_build/install/default/lib/rlib/pped.rei"
"_build/install/default/lib/rlib/rlib.cmi"
"_build/install/default/lib/rlib/rlib.cmx"
"_build/install/default/lib/rlib/rlib.cmt"
"_build/install/default/lib/rlib/rlib.ml-gen"
"_build/install/default/lib/rlib/rlib.cma"
"_build/install/default/lib/rlib/rlib.cmxa"
"_build/install/default/lib/rlib/rlib.a"
"_build/install/default/lib/rlib/rlib.cmxs"
]
reasononlypp rbin.pp.re
refmt rbin.pp.re.ml
ocamldep .rbin.eobjs/rbin.pp.re.ml.d
ocamlc .rbin.eobjs/rbin.{cmi,cmo,cmt}
ocamlopt .rbin.eobjs/rbin.{cmx,o}
ocamlopt rbin.exe
rbin alias runtest
Cppome
hello world
Bar
Foo
ocamlc .rlib.objs/rlib__Bar.{cmo,cmt}
ocamlc .rlib.objs/rlib__Foo.{cmo,cmt}
ocamlc .rlib.objs/rlib__Hello.{cmo,cmt}
ocamlc .rlib.objs/rlib__Pped.{cmo,cmt}
ocamlc .rlib.objs/rlib__Cppome.{cmo,cmt}
ocamlc rlib.cma
lib: [
"_build/install/default/lib/rlib/META" {"META"}
"_build/install/default/lib/rlib/opam" {"opam"}
"_build/install/default/lib/rlib/rlib__Bar.cmi" {"rlib__Bar.cmi"}
"_build/install/default/lib/rlib/rlib__Bar.cmx" {"rlib__Bar.cmx"}
"_build/install/default/lib/rlib/rlib__Bar.cmt" {"rlib__Bar.cmt"}
"_build/install/default/lib/rlib/rlib__Bar.cmti" {"rlib__Bar.cmti"}
"_build/install/default/lib/rlib/bar.mli" {"bar.mli"}
"_build/install/default/lib/rlib/bar.re" {"bar.re"}
"_build/install/default/lib/rlib/rlib__Cppome.cmi" {"rlib__Cppome.cmi"}
"_build/install/default/lib/rlib/rlib__Cppome.cmx" {"rlib__Cppome.cmx"}
"_build/install/default/lib/rlib/rlib__Cppome.cmt" {"rlib__Cppome.cmt"}
"_build/install/default/lib/rlib/rlib__Cppome.cmti" {"rlib__Cppome.cmti"}
"_build/install/default/lib/rlib/cppome.rei" {"cppome.rei"}
"_build/install/default/lib/rlib/cppome.re" {"cppome.re"}
"_build/install/default/lib/rlib/rlib__Foo.cmi" {"rlib__Foo.cmi"}
"_build/install/default/lib/rlib/rlib__Foo.cmx" {"rlib__Foo.cmx"}
"_build/install/default/lib/rlib/rlib__Foo.cmt" {"rlib__Foo.cmt"}
"_build/install/default/lib/rlib/rlib__Foo.cmti" {"rlib__Foo.cmti"}
"_build/install/default/lib/rlib/foo.rei" {"foo.rei"}
"_build/install/default/lib/rlib/foo.ml" {"foo.ml"}
"_build/install/default/lib/rlib/rlib__Hello.cmi" {"rlib__Hello.cmi"}
"_build/install/default/lib/rlib/rlib__Hello.cmx" {"rlib__Hello.cmx"}
"_build/install/default/lib/rlib/rlib__Hello.cmt" {"rlib__Hello.cmt"}
"_build/install/default/lib/rlib/rlib__Hello.cmti" {"rlib__Hello.cmti"}
"_build/install/default/lib/rlib/hello.rei" {"hello.rei"}
"_build/install/default/lib/rlib/hello.re" {"hello.re"}
"_build/install/default/lib/rlib/rlib__Pped.cmi" {"rlib__Pped.cmi"}
"_build/install/default/lib/rlib/rlib__Pped.cmx" {"rlib__Pped.cmx"}
"_build/install/default/lib/rlib/rlib__Pped.cmt" {"rlib__Pped.cmt"}
"_build/install/default/lib/rlib/rlib__Pped.cmti" {"rlib__Pped.cmti"}
"_build/install/default/lib/rlib/pped.rei" {"pped.rei"}
"_build/install/default/lib/rlib/pped.re" {"pped.re"}
"_build/install/default/lib/rlib/rlib.cmi" {"rlib.cmi"}
"_build/install/default/lib/rlib/rlib.cmx" {"rlib.cmx"}
"_build/install/default/lib/rlib/rlib.cmt" {"rlib.cmt"}
"_build/install/default/lib/rlib/rlib.ml-gen" {"rlib.ml-gen"}
"_build/install/default/lib/rlib/rlib.cma" {"rlib.cma"}
"_build/install/default/lib/rlib/rlib.cmxa" {"rlib.cmxa"}
"_build/install/default/lib/rlib/rlib$ext_lib" {"rlib$ext_lib"}
"_build/install/default/lib/rlib/rlib.cmxs" {"rlib.cmxs"}
"_build/install/default/lib/rlib/rlib.dune" {"rlib.dune"}
]