diff options
| -rw-r--r-- | .gitlab-ci.yml | 9 | ||||
| -rw-r--r-- | doc/sphinx/changes.rst | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9e04762d1e..819ad8a214 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -615,10 +615,11 @@ test-suite:4.11+trunk+dune: variables: OCAMLVER: 4.11.0+trunk -test-suite:4.12+trunk+dune: - extends: .test-suite:ocaml+beta+dune-template - variables: - OCAMLVER: 4.12.0+trunk +# Pending on https://github.com/ocaml/dune/pull/3585 +# test-suite:4.12+trunk+dune: +# extends: .test-suite:ocaml+beta+dune-template +# variables: +# OCAMLVER: 4.12.0+trunk test-suite:base+async: extends: .test-suite-template diff --git a/doc/sphinx/changes.rst b/doc/sphinx/changes.rst index 8427300dc4..e5c2056c40 100644 --- a/doc/sphinx/changes.rst +++ b/doc/sphinx/changes.rst @@ -55,6 +55,10 @@ Maxime Dénès, Emilio Jesús Gallego Arias, Gaëtan Gilbert, Michael Soegtrop and Théo Zimmermann worked on maintaining and improving the continuous integration system and package building infrastructure. +Erik Martin-Dorel has maintained the `Coq Docker images +<https://hub.docker.com/r/coqorg/coq>`_ that are used in many Coq +projects for continuous integration. + The OPAM repository for |Coq| packages has been maintained by Guillaume Claret, Karl Palmskog, Matthieu Sozeau and Enrico Tassi with contributions from many users. A list of packages is available at |