_

ocaml · May 1, 2018 · 3cb1a2a · 3cb1a2a
1 parent d3aeee1
commit 3cb1a2a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/.travis-ci.sh b/.travis-ci.sh
@@ -79,7 +79,8 @@ case "$TARGET" in
       fi
       opam list
       echo "version: \"1.0+dev$DATE\"" >> dune.opam
-      cat > jbuilder.opam <<EOF
+      mkdir -p ../jbuilder
+      cat > ../jbuilder/jbuilder.opam <<EOF
 version: "1.0+dev$DATE"
 opam-version: "1.2"
 maintainer: "opensource@janestreet.com"
@@ -90,8 +91,8 @@ dev-repo: "https://github.com/ocaml/dune.git"
 license: "Apache-2.0"
 depends: [ "dune" ]
 EOF
-      opam pin add dune     . --no-action --yes
-      opam pin add jbuilder . --no-action --yes
+      opam pin add dune     .           --no-action --yes
+      opam pin add jbuilder ../jbuilder --no-action --yes
       opam install utop ppx_driver odoc ocaml-migrate-parsetree js_of_ocaml-ppx js_of_ocaml-compiler --yes
       echo -en "travis_fold:end:opam.deps\r"
     fi

diff --git a/vendor/boot/opamBaseParser.ml b/vendor/boot/opamBaseParser.ml
@@ -1,8 +1,6 @@
 open OpamParserTypes
 let main _lex _lexbuf fn =
-  assert (fn = "dune.opam" ||
-          (* For travis *)
-          fn = "jbuilder.opam");
+  assert (fn = "dune.opam");
   { file_contents = []
   ; file_name     = fn
   }