diff options
| author | Gaëtan Gilbert | 2020-03-19 13:49:42 +0100 |
|---|---|---|
| committer | Gaëtan Gilbert | 2020-03-19 13:49:42 +0100 |
| commit | 918e301faa228190f885f860510f4b6c352620f5 (patch) | |
| tree | de8b69f992b8ac676df6cceda222df46d94cc0a9 /dev | |
| parent | 3ae4231d30edfa928595b6fa886ce6df1a495089 (diff) | |
| parent | 2cc2950917f35c16bfb38264132c7558a5382f22 (diff) | |
Merge PR #11860: [ci] [docker] Update to 4.09.1
Reviewed-by: SkySkimmer
Diffstat (limited to 'dev')
| -rwxr-xr-x | dev/ci/azure-opam.sh | 2 | ||||
| -rw-r--r-- | dev/ci/docker/bionic_coq/Dockerfile | 4 | ||||
| -rw-r--r-- | dev/dune-workspace.all | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/dev/ci/azure-opam.sh b/dev/ci/azure-opam.sh index ee6c62673b..7b3e2703b8 100755 --- a/dev/ci/azure-opam.sh +++ b/dev/ci/azure-opam.sh @@ -2,7 +2,7 @@ set -e -x -OPAM_VARIANT=ocaml-variants.4.09.0+mingw64c +OPAM_VARIANT=ocaml-variants.4.09.1+mingw64c wget https://github.com/fdopen/opam-repository-mingw/releases/download/0.0.0.2/opam64.tar.xz -O opam64.tar.xz tar -xf opam64.tar.xz diff --git a/dev/ci/docker/bionic_coq/Dockerfile b/dev/ci/docker/bionic_coq/Dockerfile index 979b5917d4..4e229bb777 100644 --- a/dev/ci/docker/bionic_coq/Dockerfile +++ b/dev/ci/docker/bionic_coq/Dockerfile @@ -1,4 +1,4 @@ -# CACHEKEY: "bionic_coq-V2019-03-14-V14" +# CACHEKEY: "bionic_coq-V2019-03-18-V93" # ^^ Update when modifying this file. FROM ubuntu:bionic @@ -56,7 +56,7 @@ RUN opam switch create "${COMPILER}+32bit" && eval $(opam env) && \ opam install $BASE_OPAM # EDGE switch -ENV COMPILER_EDGE="4.09.0" \ +ENV COMPILER_EDGE="4.09.1" \ BASE_OPAM_EDGE="dune-release.1.3.3 ocamlformat.0.12" # EDGE+flambda switch, we install CI_OPAM as to be able to use diff --git a/dev/dune-workspace.all b/dev/dune-workspace.all index 49e338d0a5..556493ffad 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.09.0))) -(context (opam (switch 4.09.0+flambda))) +(context (opam (switch 4.09.1))) +(context (opam (switch 4.09.1+flambda))) |