From 3863a97b86a26e5f253db4e88a18f38a2cfc5ece Mon Sep 17 00:00:00 2001 From: Emilio Jesus Gallego Arias Date: Sun, 17 Feb 2019 22:04:12 +0100 Subject: [gitlab] [docker] [ci] Remove "edge" compiler switch. Since a long time the compiler switch is not very useful as it is not used to test any CI. The `edge+flambda` version seems stable enough to carry out the `edge` testing by itself, thus we remove the `egde` switch saving valuable Docker image size and Gitlab runners. We also tweak the `pkg:opam` job as to correctly set the version of the pinned local package. --- dev/ci/docker/bionic_coq/Dockerfile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'dev/ci/docker/bionic_coq') diff --git a/dev/ci/docker/bionic_coq/Dockerfile b/dev/ci/docker/bionic_coq/Dockerfile index 4cd7faf757..43278c37b1 100644 --- a/dev/ci/docker/bionic_coq/Dockerfile +++ b/dev/ci/docker/bionic_coq/Dockerfile @@ -1,4 +1,4 @@ -# CACHEKEY: "bionic_coq-V2019-01-28-V1" +# CACHEKEY: "bionic_coq-V2019-02-17-V1" # ^^ Update when modifying this file. FROM ubuntu:bionic @@ -56,9 +56,6 @@ ENV COMPILER_EDGE="4.07.1" \ COQIDE_OPAM_EDGE="lablgtk.2.18.6 conf-gtksourceview.2" \ BASE_OPAM_EDGE="dune-release.1.1.0" -RUN opam switch create $COMPILER_EDGE && eval $(opam env) && \ - opam install $BASE_OPAM $BASE_OPAM_EDGE $COQIDE_OPAM_EDGE - # EDGE+flambda switch, we install CI_OPAM as to be able to use # `ci-template-flambda` with everything. RUN opam switch create "${COMPILER_EDGE}+flambda" && eval $(opam env) && \ -- cgit v1.2.3