aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmilio Jesus Gallego Arias2020-03-18 17:15:07 -0400
committerEmilio Jesus Gallego Arias2020-03-18 17:26:39 -0400
commit2cc2950917f35c16bfb38264132c7558a5382f22 (patch)
tree7c7a87dcb03ae5408248da35950ed1535aa6a830
parenta1315d78a5b3c6095848298f03ca328380a7d453 (diff)
[ci] [docker] Update to 4.09.1
That release includes non trivial changes related C compilers, in particular due to `-fno-common` support.
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--INSTALL.md4
-rw-r--r--azure-pipelines.yml2
-rwxr-xr-xdev/ci/azure-opam.sh2
-rw-r--r--dev/ci/docker/bionic_coq/Dockerfile4
-rw-r--r--dev/dune-workspace.all4
-rw-r--r--doc/changelog/11-infrastructure-and-dependencies/11860-ci+ocaml_to_4091.rst4
7 files changed, 13 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5aa0fee16f..00ccc9f137 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,7 @@ stages:
variables:
# Format: $IMAGE-V$DATE [Cache is not used as of today but kept here
# for reference]
- CACHEKEY: "bionic_coq-V2019-03-14-V14"
+ CACHEKEY: "bionic_coq-V2019-03-18-V93"
IMAGE: "$CI_REGISTRY_IMAGE:$CACHEKEY"
# By default, jobs run in the base switch; override to select another switch
OPAM_SWITCH: "base"
diff --git a/INSTALL.md b/INSTALL.md
index a55e1e9ac2..0c98a611a5 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -7,7 +7,7 @@ Build Requirements
To compile Coq yourself, you need:
- [OCaml](https://ocaml.org/) (version >= 4.05.0)
- (This version of Coq has been tested up to OCaml 4.09.0)
+ (This version of Coq has been tested up to OCaml 4.09.1)
- The [num](https://github.com/ocaml/num) library; note that it is
included in the OCaml distribution for OCaml versions < 4.06.0
@@ -45,7 +45,7 @@ CoqIDE with:
Opam (https://opam.ocaml.org/) is recommended to install OCaml and
the corresponding packages.
- $ opam switch create coq 4.09.0+flambda
+ $ opam switch create coq 4.09.1+flambda
$ eval $(opam env)
$ opam install num ocamlfind lablgtk3-sourceview3
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 98e17e8fe8..aae2c3cb42 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -72,7 +72,7 @@ jobs:
opam list
displayName: 'Install OCaml dependencies'
env:
- COMPILER: "4.09.0"
+ COMPILER: "4.09.1"
FINDLIB_VER: ".1.8.1"
OPAMYES: "true"
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)))
diff --git a/doc/changelog/11-infrastructure-and-dependencies/11860-ci+ocaml_to_4091.rst b/doc/changelog/11-infrastructure-and-dependencies/11860-ci+ocaml_to_4091.rst
new file mode 100644
index 0000000000..94e2c34828
--- /dev/null
+++ b/doc/changelog/11-infrastructure-and-dependencies/11860-ci+ocaml_to_4091.rst
@@ -0,0 +1,4 @@
+- **Added:**
+ Bump official OCaml support to 4.09.1
+ (`#11860 <https://github.com/coq/coq/pull/11860>`_,
+ by Emilio Jesus Gallego Arias).