Commit 70eb8cd9 authored by Guillaume Melquiond's avatar Guillaume Melquiond

Switch to the latest Debian release.

As a consequence, packages for CVC3 and Spass are no longer available.

This commit also removes OCaml versions before 4.05.0 and adds them
till 4.09.0.
parent 8db42030
......@@ -6,7 +6,7 @@ stages:
- deploy
variables:
BUILD_IMAGE: "$CI_REGISTRY_IMAGE:ci-master-2019-06-20"
BUILD_IMAGE: "$CI_REGISTRY_IMAGE:ci-master-2019-10-04"
GIT_CLEAN_FLAGS: "-ffdxq"
build-image:
......@@ -39,21 +39,6 @@ build-system:
COMPILER: ocaml-system
<<: *build_definition
build-4.02.3:
variables:
COMPILER: 4.02.3
<<: *build_definition
build-4.03.0:
variables:
COMPILER: 4.03.0
<<: *build_definition
build-4.04.2:
variables:
COMPILER: 4.04.2
<<: *build_definition
build-4.05.0:
variables:
COMPILER: 4.05.0
......@@ -69,6 +54,16 @@ build-4.07.1:
COMPILER: 4.07.1
<<: *build_definition
build-4.08.1:
variables:
COMPILER: 4.08.1
<<: *build_definition
build-4.09.0:
variables:
COMPILER: 4.09.0
<<: *build_definition
.bench_template1: &bench_definition_always
stage: test
script:
......@@ -84,21 +79,6 @@ build-4.07.1:
bench-system:
<<: *bench_definition_always
bench-4.02.3:
variables:
COMPILER: 4.02.3
<<: *bench_definition
bench-4.03.0:
variables:
COMPILER: 4.03.0
<<: *bench_definition
bench-4.04.2:
variables:
COMPILER: 4.04.2
<<: *bench_definition
bench-4.05.0:
variables:
COMPILER: 4.05.0
......@@ -114,6 +94,16 @@ bench-4.07.1:
COMPILER: 4.07.1
<<: *bench_definition_always
bench-4.08.1:
variables:
COMPILER: 4.08.1
<<: *bench_definition
bench-4.09.0:
variables:
COMPILER: 4.09.1
<<: *bench_definition
full:
stage: test
variables:
......
# If you modify this file, make sure to update the BUILD_IMAGE variable in .gitlab-ci.yml.
FROM debian:stable
FROM debian:buster
USER root
......@@ -8,7 +8,7 @@ USER root
ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update -yq && \
apt-get upgrade -yq --with-new-pkgs --auto-remove && \
apt-get install -yq --no-install-recommends wget libgmp-dev gtk+-2.0 libgtksourceview2.0-dev xvfb unzip build-essential autoconf automake ocaml-nox ca-certificates git xauth hevea texlive-latex-extra lmodern texlive-fonts-recommended cvc3 spass && \
apt-get install -yq --no-install-recommends wget libgmp-dev gtk+-2.0 libgtksourceview2.0-dev xvfb unzip build-essential autoconf automake ocaml-nox ca-certificates git xauth hevea texlive-latex-extra lmodern texlive-plain-generic texlive-fonts-recommended && \
apt-get clean
RUN wget --quiet https://github.com/ocaml/opam/releases/download/2.0.0/opam-2.0.0-x86_64-linux -O /usr/local/bin/opam && \
......@@ -48,12 +48,11 @@ WORKDIR /home/why3
ENV OPAM_PACKAGES="menhir conf-gtksourceview lablgtk ocamlgraph zarith camlzip alt-ergo"
RUN opam init -y --no-setup -j1 --compiler=ocaml-system --disable-sandboxing && \
opam install -y $OPAM_PACKAGES && \
opam switch create 4.02.3 ocaml-base-compiler.4.02.3 && opam install -y $OPAM_PACKAGES && \
opam switch create 4.03.0 ocaml-base-compiler.4.03.0 && opam install -y $OPAM_PACKAGES && \
opam switch create 4.04.2 ocaml-base-compiler.4.04.2 && opam install -y $OPAM_PACKAGES && \
opam switch create 4.05.0 ocaml-base-compiler.4.05.0 && opam install -y $OPAM_PACKAGES && \
opam switch create 4.06.1 ocaml-base-compiler.4.06.1 && opam install -y $OPAM_PACKAGES && \
opam switch create 4.07.1 ocaml-base-compiler.4.07.1 && opam install -y $OPAM_PACKAGES && \
opam switch create 4.08.1 ocaml-base-compiler.4.08.1 && opam install -y $OPAM_PACKAGES && \
opam switch create 4.09.0 ocaml-base-compiler.4.09.0 && opam install -y $OPAM_PACKAGES && \
opam switch create bench ocaml-base-compiler.4.05.0 && opam install -y $OPAM_PACKAGES && \
opam switch create full ocaml-base-compiler.4.07.1 && opam install -y $OPAM_PACKAGES && \
opam repository add coq-released https://coq.inria.fr/opam/released --all-switches && \
......
......@@ -38,10 +38,13 @@ target_version = "8.7.2"
name = "CVC3"
version = "2.2"
alternative = ""
policy = "upgrade"
target_alternative = ""
target_name = "CVC3"
target_version = "2.4.1"
policy = "remove"
[uninstalled_prover cvc3_2_4_1]
name = "CVC3"
version = "2.4.1"
alternative = ""
policy = "remove"
[uninstalled_prover cvc4_1_2]
name = "CVC4"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment