diff options
author | Gaëtan Gilbert <gaetan.gilbert@skyskimmer.net> | 2018-05-07 15:30:38 +0200 |
---|---|---|
committer | Gaëtan Gilbert <gaetan.gilbert@skyskimmer.net> | 2018-05-07 15:30:38 +0200 |
commit | 612ca9e742c3196ea5faad100bb95d9e08ebe07e (patch) | |
tree | 3129f7390a325b386acb3c88fab1bab21954791e /dev | |
parent | a8985ab0e8cebb8b06ff6680ac65121357448076 (diff) | |
parent | 52caadda3674c126cbec014f0727e696278868f3 (diff) |
Merge PR #7445: [ci] Add ounit to the base Docker package set.
Diffstat (limited to 'dev')
-rw-r--r-- | dev/ci/docker/bionic_coq/Dockerfile | 5 | ||||
-rwxr-xr-x | dev/ci/docker/bionic_coq/hooks/post_push | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/dev/ci/docker/bionic_coq/Dockerfile b/dev/ci/docker/bionic_coq/Dockerfile index 5698175c5..920100157 100644 --- a/dev/ci/docker/bionic_coq/Dockerfile +++ b/dev/ci/docker/bionic_coq/Dockerfile @@ -15,12 +15,13 @@ ENV NJOBS="2" \ OPAMROOT=/root/.opamcache \ OPAMROOTISOK="true" +# Base opam is the set of base packages required by Coq ENV COMPILER="4.02.3" \ - BASE_OPAM="num ocamlfind jbuilder" + BASE_OPAM="num ocamlfind jbuilder ounit" RUN opam init -a -y -j $NJOBS --compiler="$COMPILER" default https://opam.ocaml.org && eval $(opam config env) && opam update -# Setup of the base switch +# Setup of the base switch; CI_OPAM contains Coq's CI dependencies. ENV CAMLP5_VER="6.14" \ COQIDE_OPAM="lablgtk.2.18.5 conf-gtksourceview.2" \ CI_OPAM="menhir elpi ocamlgraph" diff --git a/dev/ci/docker/bionic_coq/hooks/post_push b/dev/ci/docker/bionic_coq/hooks/post_push index 008ef1af3..6daf337a7 100755 --- a/dev/ci/docker/bionic_coq/hooks/post_push +++ b/dev/ci/docker/bionic_coq/hooks/post_push @@ -1,6 +1,6 @@ #!/usr/bin/env bash -COQCI_VERSION=V2018-05-05 +COQCI_VERSION=V2018-05-07 docker tag $IMAGE_NAME $DOCKER_REPO:$COQCI_VERSION docker push $DOCKER_REPO:$COQCI_VERSION |