diff options
| author | Emilio Jesus Gallego Arias | 2018-11-07 12:18:43 +0100 |
|---|---|---|
| committer | Emilio Jesus Gallego Arias | 2018-11-07 12:18:43 +0100 |
| commit | ddce2d5b3ace700da602168da4e6bde7cd04e076 (patch) | |
| tree | eeeb47b43c761a9ed5af21c60236112625773e42 /dev | |
| parent | 19b7ce2f39eaf37e48d1d12ef73defab3c9fbdb2 (diff) | |
| parent | d6a5b036ba11850441afe86dedfe8f3591df9cad (diff) | |
Merge PR #8868: [Docker] Update OCaml (4.07.1) and camlp5 (7.07-almost)
Diffstat (limited to 'dev')
| -rw-r--r-- | dev/ci/docker/bionic_coq/Dockerfile | 6 | ||||
| -rw-r--r-- | dev/dune-workspace.all | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/dev/ci/docker/bionic_coq/Dockerfile b/dev/ci/docker/bionic_coq/Dockerfile index 098c950b32..4ddb582414 100644 --- a/dev/ci/docker/bionic_coq/Dockerfile +++ b/dev/ci/docker/bionic_coq/Dockerfile @@ -1,4 +1,4 @@ -# CACHEKEY: "bionic_coq-V2018-10-23-V1" +# CACHEKEY: "bionic_coq-V2018-10-30-V1" # ^^ Update when modifying this file. FROM ubuntu:bionic @@ -53,8 +53,8 @@ RUN opam switch create "${COMPILER}+32bit" && eval $(opam env) && \ opam install $BASE_OPAM camlp5.$CAMLP5_VER # EDGE switch -ENV COMPILER_EDGE="4.07.0" \ - CAMLP5_VER_EDGE="7.06" \ +ENV COMPILER_EDGE="4.07.1" \ + CAMLP5_VER_EDGE="7.06.10-g84ce6cc4" \ COQIDE_OPAM_EDGE="lablgtk.2.18.6 conf-gtksourceview.2" \ BASE_OPAM_EDGE="dune-release.1.1.0" diff --git a/dev/dune-workspace.all b/dev/dune-workspace.all index f45f6de529..cf95941de5 100644 --- a/dev/dune-workspace.all +++ b/dev/dune-workspace.all @@ -3,5 +3,5 @@ ; Add custom flags here. Default developer profile is `dev` (context (opam (switch 4.05.0))) (context (opam (switch 4.05.0+32bit))) -(context (opam (switch 4.07.0))) -(context (opam (switch 4.07.0+flambda))) +(context (opam (switch 4.07.1))) +(context (opam (switch 4.07.1+flambda))) |