diff options
| author | Gaëtan Gilbert | 2019-03-21 17:02:19 +0100 |
|---|---|---|
| committer | Gaëtan Gilbert | 2019-03-21 17:02:19 +0100 |
| commit | 96c9b16f03ef6898b575a0cc78470f0fa86fd2e4 (patch) | |
| tree | 80d6923e38df7e0d7b95075f2192dbda75660e25 | |
| parent | ce97ef5375e1596cd7b2510cf576f2961329f523 (diff) | |
| parent | 369b7e2e681599d8e04f7ee5c87437ecca0621a5 (diff) | |
Merge PR #9797: [ci] Fix OCaml trunk build.
Reviewed-by: SkySkimmer
| -rw-r--r-- | .gitlab-ci.yml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e688fbd463..aacd248c43 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -465,7 +465,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 @@ -489,9 +491,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 |