aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmilio Jesus Gallego Arias2019-03-18 17:41:08 +0100
committerEmilio Jesus Gallego Arias2019-03-19 13:20:58 +0100
commit369b7e2e681599d8e04f7ee5c87437ecca0621a5 (patch)
treeaeb39fcd0020f2ef54f23fd4e7e26954fc7de8ba
parentf1ca51445650a6595a9dfd28c365b83fa25d1eea (diff)
[ci] Fix OCaml trunk build.
This is a temporal pinning, we should amend it before merge in Coq [once it is indeed merged upstream] , see https://gitlab.camlcity.org/gerd/lib-findlib/merge_requests/22
-rw-r--r--.gitlab-ci.yml9
1 files changed, 6 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b6e7f8aeef..00eae04e21 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -464,7 +464,9 @@ test-suite:edge+trunk+make:
- eval $(opam env)
- opam repo add ocaml-beta https://github.com/ocaml/ocaml-beta-repository.git
- opam update
- - opam install ocaml-variants=4.09.0+trunk num
+ - opam install ocaml-variants=4.09.0+trunk
+ - opam pin add -n ocamlfind https://gitlab.camlcity.org/gerd/lib-findlib.git#gerd/optional-vmthreads
+ - opam install num
- eval $(opam env)
# We avoid problems with warnings:
- ./configure -profile devel -warn-error no
@@ -488,9 +490,10 @@ test-suite:edge+trunk+dune:
- eval $(opam env)
- opam repo add ocaml-beta https://github.com/ocaml/ocaml-beta-repository.git
- opam update
- - opam install ocaml-variants=4.09.0+trunk num
+ - opam install ocaml-variants=4.09.0+trunk
+ - opam pin add -n ocamlfind https://gitlab.camlcity.org/gerd/lib-findlib.git#gerd/optional-vmthreads
- opam pin add dune --dev # ounit lablgtk conf-gtksourceview
- - opam install dune
+ - opam install dune num
- eval $(opam env)
# We use the release profile to avoid problems with warnings
- make -f Makefile.dune trunk